Author: mhabersack
Date: 2007-09-05 13:32:21 -0400 (Wed, 05 Sep 2007)
New Revision: 85373
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
trunk/mcs/class/System.Web/System.Web.Compilation/ThemeDirectoryCompiler.cs
trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI/RootBuilder.cs
Log:
2007-09-05 Marek Habersack <[EMAIL PROTECTED]>
* RootBuilder.cs: make Foundry settable, but protect the backing
field from being set to null.
2007-09-05 Marek Habersack <[EMAIL PROTECTED]>
* ThemeDirectoryCompiler.cs: all the skin files compiled in one
batch must share the same component foundry. Under MS.NET if any
earlier .skin file registers a control prefix any later .skin
files may use it without registering.
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2007-09-05
17:18:48 UTC (rev 85372)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2007-09-05
17:32:21 UTC (rev 85373)
@@ -1,3 +1,10 @@
+2007-09-05 Marek Habersack <[EMAIL PROTECTED]>
+
+ * ThemeDirectoryCompiler.cs: all the skin files compiled in one
+ batch must share the same component foundry. Under MS.NET if any
+ earlier .skin file registers a control prefix any later .skin
+ files may use it without registering.
+
2007-09-04 Marek Habersack <[EMAIL PROTECTED]>
* TemplateControlCompiler.cs: make sure that base class doesn't
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/ThemeDirectoryCompiler.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/ThemeDirectoryCompiler.cs
2007-09-05 17:18:48 UTC (rev 85372)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/ThemeDirectoryCompiler.cs
2007-09-05 17:32:21 UTC (rev 85373)
@@ -59,6 +59,7 @@
}
ptp.LinkedStyleSheets = css_urls;
+ AspComponentFoundry shared_foundry = new
AspComponentFoundry ();
ptp.RootBuilder = new RootBuilder ();
string skin_file_url;
@@ -70,6 +71,7 @@
ptp.AddDependency (skin_files [i]);
AspGenerator gen = new AspGenerator (ptfp);
+ ptfp.RootBuilder.Foundry = shared_foundry;
gen.Parse ();
if (ptfp.RootBuilder.Children != null)
Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2007-09-05 17:18:48 UTC
(rev 85372)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2007-09-05 17:32:21 UTC
(rev 85373)
@@ -1,3 +1,8 @@
+2007-09-05 Marek Habersack <[EMAIL PROTECTED]>
+
+ * RootBuilder.cs: make Foundry settable, but protect the backing
+ field from being set to null.
+
2007-09-04 Marek Habersack <[EMAIL PROTECTED]>
* TemplateParser.cs: don't optimize for case when 'name' is a full
Modified: trunk/mcs/class/System.Web/System.Web.UI/RootBuilder.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/RootBuilder.cs 2007-09-05
17:18:48 UTC (rev 85372)
+++ trunk/mcs/class/System.Web/System.Web.UI/RootBuilder.cs 2007-09-05
17:32:21 UTC (rev 85373)
@@ -173,6 +173,10 @@
internal AspComponentFoundry Foundry {
get { return foundry; }
+ set {
+ if (value is AspComponentFoundry)
+ foundry = value;
+ }
}
#if NET_2_0
// FIXME: it's empty (but not null) when using the new default
ctor
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
