Merge pull request #1473 from esdrubal/sq

[mono.git] / mcs / class / System.Web.Extensions / System.Web.UI / ScriptManagerProxy.cs

diff --git a/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManagerProxy.cs b/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManagerProxy.cs
index 615bad670451653a2bce98cab3e8cb7f9269c8b8..98b4329d061f5ab59c0b96d32401384030353ee8 100644 (file)
--- a/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManagerProxy.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManagerProxy.cs
@@ -42,6 +42,9 @@ namespace System.Web.UI
        {
                ScriptManager _scriptManager;
                ScriptReferenceCollection _scripts;
+#if NET_3_5
+               CompositeScriptReference _compositeScript;
+#endif
                ServiceReferenceCollection _services;
                AuthenticationServiceManager _authenticationService;
                ProfileServiceManager _profileService;
@@ -81,7 +84,20 @@ namespace System.Web.UI
                                return _scripts;
                        }
                }
-
+#if NET_3_5
+               [PersistenceMode (PersistenceMode.InnerProperty)]
+               [Category ("Behavior")]
+               [DefaultValue (null)]
+               [DesignerSerializationVisibility (DesignerSerializationVisibility.Content)]
+               [MergableProperty (false)]
+               public CompositeScriptReference CompositeScript {
+                       get {
+                               if (_compositeScript == null)
+                                       _compositeScript = new CompositeScriptReference ();
+                               return _compositeScript;
+                       }
+               }
+#endif
                [MergableProperty (false)]
                [PersistenceMode (PersistenceMode.InnerProperty)]
                [Category ("Behavior")]
@@ -117,7 +133,7 @@ namespace System.Web.UI
                        }
                }
 
-               protected override void OnInit (EventArgs e) {
+               protected internal override void OnInit (EventArgs e) {
                        base.OnInit (e);
                        ScriptManager.RegisterProxy (this);
                }