From e551f6196e5689f06911125ac1801c64a52e618a Mon Sep 17 00:00:00 2001 From: Igor Zelmanovich Date: Thu, 3 Jan 2008 08:58:29 +0000 Subject: [PATCH] encode ExpandoAttribute if need. svn path=/trunk/mcs/; revision=92159 --- .../System.Web.UI/ScriptManager.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs b/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs index 6d687830b91..14e87dfd086 100644 --- a/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs +++ b/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs @@ -1259,8 +1259,17 @@ namespace System.Web.UI if (_expandoAttributes != null) { for (int i = 0; i < _expandoAttributes.Count; i++) { RegisteredExpandoAttribute attr = _expandoAttributes [i]; - if (HasBeenRendered (attr.Control)) - WriteCallbackOutput (writer, expando, "document.getElementById('Label2')['" + attr.Name + "']", "\"" + attr.Value + "\""); + if (HasBeenRendered (attr.Control)) { + string value; + if (attr.Encode) { + StringWriter sw = new StringWriter (); + Newtonsoft.Json.JavaScriptUtils.WriteEscapedJavaScriptString (attr.Value, sw); + value = sw.ToString (); + } + else + value = "\"" + attr.Value + "\""; + WriteCallbackOutput (writer, expando, "document.getElementById('Label2')['" + attr.Name + "']", value); + } } } } -- 2.25.1