Skip to content

Commit 45c577c

Browse files
elanatframeworkelanatframework
authored
Update ViewCodeCombination.cs
1 parent 349124b commit 45c577c

File tree

1 file changed

+24
-4
lines changed

1 file changed

+24
-4
lines changed

‎class/ViewCodeCombination.cs‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1604,7 +1604,11 @@ private void SetMethod(string AspxFilePath, string Controller, string Controller
16041604
TmpMethodCodeTemplateValue += " controller.CodeBehindConstructor" + ControllerConstructor + ";" + Environment.NewLine;
16051605

16061606
TmpMethodCodeTemplateValue += " controller.PageLoad(context);" + Environment.NewLine;
1607-
TmpMethodCodeTemplateValue += " this.WebFormsValue += controller.WebFormsValue;" + Environment.NewLine;
1607+
TmpMethodCodeTemplateValue += " this.WebFormsValue += controller.WebFormsValue;" + Environment.NewLine + Environment.NewLine;
1608+
1609+
TmpMethodCodeTemplateValue += " if (controller.WebSocketId != null)" + Environment.NewLine;
1610+
TmpMethodCodeTemplateValue += " WebSocketId = controller.WebSocketId;" + Environment.NewLine + Environment.NewLine;
1611+
16081612
TmpMethodCodeTemplateValue += " if (controller.IgnoreLayout != null)" + Environment.NewLine;
16091613
TmpMethodCodeTemplateValue += " IgnoreLayout = controller.IgnoreLayout;" + Environment.NewLine + Environment.NewLine;
16101614

@@ -1661,7 +1665,10 @@ private void SetMethod(string AspxFilePath, string Controller, string Controller
16611665
TmpMethodCodeTemplateValue += " }" + Environment.NewLine + Environment.NewLine;
16621666

16631667
TmpMethodCodeTemplateValue += " controller.ResponseText += model.ResponseText;" + Environment.NewLine;
1664-
TmpMethodCodeTemplateValue += " this.WebFormsValue += model.WebFormsValue;" + Environment.NewLine;
1668+
TmpMethodCodeTemplateValue += " this.WebFormsValue += model.WebFormsValue;" + Environment.NewLine + Environment.NewLine;
1669+
1670+
TmpMethodCodeTemplateValue += " if (model.WebSocketId != null)" + Environment.NewLine;
1671+
TmpMethodCodeTemplateValue += " WebSocketId = model.WebSocketId;" + Environment.NewLine;
16651672
}
16661673
}
16671674

@@ -1706,6 +1713,9 @@ private void SetMethod(string AspxFilePath, string Controller, string Controller
17061713
TmpMethodCodeTemplateValue += " this.WebFormsValue += model.WebFormsValue;" + Environment.NewLine;
17071714
TmpMethodCodeTemplateValue += " ReturnValue += model.ResponseText;" + Environment.NewLine + Environment.NewLine;
17081715

1716+
TmpMethodCodeTemplateValue += " if (model.WebSocketId != null)" + Environment.NewLine;
1717+
TmpMethodCodeTemplateValue += " WebSocketId = model.WebSocketId;" + Environment.NewLine + Environment.NewLine;
1718+
17091719
TmpMethodCodeTemplateValue += " if (!model.IgnoreView)" + Environment.NewLine;
17101720
TmpMethodCodeTemplateValue += " {" + Environment.NewLine;
17111721
TmpMethodCodeTemplateValue += TextToCodeCombination + Environment.NewLine;
@@ -1795,10 +1805,14 @@ private void SetMethod(string AspxFilePath, string Controller, string Controller
17951805
TmpMethodCodeTemplateValue += " controller.CodeBehindConstructor" + ControllerConstructor + ";" + Environment.NewLine;
17961806

17971807
TmpMethodCodeTemplateValue += " controller.PageLoad(context);" + Environment.NewLine;
1798-
TmpMethodCodeTemplateValue += " this.WebFormsValue += controller.WebFormsValue;" + Environment.NewLine;
1808+
TmpMethodCodeTemplateValue += " this.WebFormsValue += controller.WebFormsValue;" + Environment.NewLine + Environment.NewLine;
1809+
17991810
TmpMethodCodeTemplateValue += " if (controller.IgnoreLayout != null)" + Environment.NewLine;
18001811
TmpMethodCodeTemplateValue += " IgnoreLayout = controller.IgnoreLayout;" + Environment.NewLine + Environment.NewLine;
18011812

1813+
TmpMethodCodeTemplateValue += " if (controller.WebSocketId != null)" + Environment.NewLine;
1814+
TmpMethodCodeTemplateValue += " WebSocketId = controller.WebSocketId;" + Environment.NewLine + Environment.NewLine;
1815+
18021816
TmpMethodCodeTemplateValue += " ViewData.AddList(controller.ViewData.GetList());" + Environment.NewLine;
18031817
TmpMethodCodeTemplateValue += " if (!string.IsNullOrEmpty(controller.ViewPath))" + Environment.NewLine;
18041818
TmpMethodCodeTemplateValue += " {" + Environment.NewLine;
@@ -1848,7 +1862,10 @@ private void SetMethod(string AspxFilePath, string Controller, string Controller
18481862
TmpMethodCodeTemplateValue += " }" + Environment.NewLine + Environment.NewLine;
18491863

18501864
TmpMethodCodeTemplateValue += " controller.ResponseText += model.ResponseText;" + Environment.NewLine;
1851-
TmpMethodCodeTemplateValue += " this.WebFormsValue += model.WebFormsValue;" + Environment.NewLine;
1865+
TmpMethodCodeTemplateValue += " this.WebFormsValue += model.WebFormsValue;" + Environment.NewLine + Environment.NewLine;
1866+
1867+
TmpMethodCodeTemplateValue += " if (model.WebSocketId != null)" + Environment.NewLine;
1868+
TmpMethodCodeTemplateValue += " WebSocketId = model.WebSocketId;" + Environment.NewLine;
18521869
}
18531870

18541871
TmpMethodCodeTemplateValue += TextToCodeCombination;
@@ -1888,6 +1905,9 @@ private void SetMethod(string AspxFilePath, string Controller, string Controller
18881905
TmpMethodCodeTemplateValue += " ReturnValue += model.ResponseText;" + Environment.NewLine;
18891906
TmpMethodCodeTemplateValue += " this.WebFormsValue += model.WebFormsValue;" + Environment.NewLine + Environment.NewLine;
18901907

1908+
TmpMethodCodeTemplateValue += " if (model.WebSocketId != null)" + Environment.NewLine;
1909+
TmpMethodCodeTemplateValue += " WebSocketId = model.WebSocketId;" + Environment.NewLine + Environment.NewLine;
1910+
18911911
TmpMethodCodeTemplateValue += " if (!model.IgnoreView)" + Environment.NewLine;
18921912
TmpMethodCodeTemplateValue += " {" + Environment.NewLine;
18931913
TmpMethodCodeTemplateValue += TextToCodeCombination + Environment.NewLine;

0 commit comments

Comments
 (0)