Author: mhabersack
Date: 2007-10-17 17:17:41 -0400 (Wed, 17 Oct 2007)
New Revision: 87714
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
trunk/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI/PageParser.cs
trunk/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
Log:
2007-10-17 Marek Habersack <[EMAIL PROTECTED]>
* TemplateParser.cs: removed code that ignored the Async and
AsyncTimeout attributes.
* PageParser.cs: handle the Async and AsyncTimeout attributes
here. Fixes bug #325450
2007-10-17 Marek Habersack <[EMAIL PROTECTED]>
* PageCompiler.cs: added code to set the AsyncMode and
AsyncTimeout Page properties.
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2007-10-17
21:13:24 UTC (rev 87713)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2007-10-17
21:17:41 UTC (rev 87714)
@@ -1,3 +1,8 @@
+2007-10-17 Marek Habersack <[EMAIL PROTECTED]>
+
+ * PageCompiler.cs: added code to set the AsyncMode and
+ AsyncTimeout Page properties.
+
2007-10-15 Marek Habersack <[EMAIL PROTECTED]>
* TemplateControlCompiler.cs, WebServiceCompiler.cs,
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
2007-10-17 21:13:24 UTC (rev 87713)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
2007-10-17 21:17:41 UTC (rev 87714)
@@ -139,6 +139,13 @@
if (pageParser.StyleSheetTheme != null)
method.Statements.Add (CreatePropertyAssign
(ctrlVar, "StyleSheetTheme", pageParser.StyleSheetTheme));
+
+ if (pageParser.Async != false)
+ method.Statements.Add (CreatePropertyAssign
(ctrlVar, "AsyncMode", pageParser.Async));
+
+ if (pageParser.AsyncTimeout != -1)
+ method.Statements.Add (CreatePropertyAssign
(ctrlVar, "AsyncTimeout",
+
TimeSpan.FromSeconds (pageParser.AsyncTimeout)));
#endif
}
Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2007-10-17 21:13:24 UTC
(rev 87713)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2007-10-17 21:17:41 UTC
(rev 87714)
@@ -1,5 +1,11 @@
2007-10-17 Marek Habersack <[EMAIL PROTECTED]>
+ * TemplateParser.cs: removed code that ignored the Async and
+ AsyncTimeout attributes.
+
+ * PageParser.cs: handle the Async and AsyncTimeout attributes
+ here. Fixes bug #325450
+
* Control.cs: properly configure control visibility in
PreRenderRecursiveInternal. The check must be made by looking at
the Visible value, not at the flags directly. Fixes bug #325303
Modified: trunk/mcs/class/System.Web/System.Web.UI/PageParser.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/PageParser.cs 2007-10-17
21:13:24 UTC (rev 87713)
+++ trunk/mcs/class/System.Web/System.Web.UI/PageParser.cs 2007-10-17
21:17:41 UTC (rev 87714)
@@ -62,6 +62,8 @@
Type baseType = typeof (Page);
#if NET_2_0
+ bool async;
+ int asyncTimeout = -1;
string masterPage;
Type masterType;
string title;
@@ -334,6 +336,16 @@
notBuffer = !GetBool (atts, "Buffer", true);
#if NET_2_0
+ async = GetBool (atts, "Async", false);
+ string asyncTimeoutVal = GetString (atts,
"AsyncTimeout", null);
+ if (asyncTimeoutVal != null) {
+ try {
+ asyncTimeout = Int32.Parse
(asyncTimeoutVal);
+ } catch (Exception) {
+ ThrowParseException ("AsyncTimeout must
be an integer value");
+ }
+ }
+
masterPage = GetString (atts, "MasterPageFile",
masterPage);
// Make sure the page exists
@@ -503,6 +515,14 @@
}
#if NET_2_0
+ internal bool Async {
+ get { return async; }
+ }
+
+ internal int AsyncTimeout {
+ get { return asyncTimeout; }
+ }
+
internal string Theme {
get { return theme; }
}
Modified: trunk/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/TemplateParser.cs 2007-10-17
21:13:24 UTC (rev 87713)
+++ trunk/mcs/class/System.Web/System.Web.UI/TemplateParser.cs 2007-10-17
21:17:41 UTC (rev 87714)
@@ -512,11 +512,6 @@
atts.Remove ("CodeBehind"); // ignored
#endif
atts.Remove ("AspCompat"); // ignored
-#if NET_2_0
- // these two are ignored for the moment
- atts.Remove ("Async");
- atts.Remove ("AsyncTimeOut");
-#endif
debug = GetBool (atts, "Debug", true);
compilerOptions = GetString (atts, "CompilerOptions",
"");
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
