Author: igorz
Date: 2008-01-03 12:43:09 -0500 (Thu, 03 Jan 2008)
New Revision: 92196
Modified:
trunk/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs
Log:
fixed RegisterStartupScript
Modified: trunk/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs
===================================================================
--- trunk/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs
2008-01-03 17:34:02 UTC (rev 92195)
+++ trunk/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs
2008-01-03 17:43:09 UTC (rev 92196)
@@ -62,6 +62,7 @@
const string hiddenField = "hiddenField";
const string arrayDeclaration = "arrayDeclaration";
const string scriptBlock = "scriptBlock";
+ const string scriptStartupBlock = "scriptStartupBlock";
const string expando = "expando";
const string onSubmit = "onSubmit";
const string asyncPostBackControlIDs =
"asyncPostBackControlIDs";
@@ -1269,7 +1270,7 @@
}
else
value = "\"" +
attr.Value + "\"";
- WriteCallbackOutput (writer,
expando, "document.getElementById('Label2')['" + attr.Name + "']", value);
+ WriteCallbackOutput (writer,
expando, "document.getElementById('" + attr.ControlId + "')['" + attr.Name +
"']", value);
}
}
}
@@ -1297,14 +1298,17 @@
registeredScripts.Add (scriptEntry.Key,
scriptEntry);
switch (scriptEntry.ScriptType) {
case
RegisteredScriptType.ClientScriptBlock:
- case
RegisteredScriptType.ClientStartupScript:
if (scriptEntry.AddScriptTags)
WriteCallbackOutput
(output, scriptBlock, scriptContentNoTags, scriptEntry.Script);
- else {
- string script =
SerializeScriptBlock (scriptEntry);
- WriteCallbackOutput
(output, scriptBlock, scriptContentWithTags, script);
- }
+ else
+ WriteCallbackOutput
(output, scriptBlock, scriptContentWithTags, SerializeScriptBlock
(scriptEntry));
break;
+ case
RegisteredScriptType.ClientStartupScript:
+ if (scriptEntry.AddScriptTags)
+ WriteCallbackOutput
(output, scriptStartupBlock, scriptContentNoTags, scriptEntry.Script);
+ else
+ WriteCallbackOutput
(output, scriptStartupBlock, scriptContentWithTags, SerializeScriptBlock
(scriptEntry));
+ break;
case
RegisteredScriptType.ClientScriptInclude:
WriteCallbackOutput (output,
scriptBlock, scriptPath, scriptEntry.Url);
break;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
