Author: igorz
Date: 2007-02-26 05:21:12 -0500 (Mon, 26 Feb 2007)
New Revision: 73419

Modified:
   trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
   trunk/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs
   trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
Log:
2007-02-26 Igor Zelmanovich <[EMAIL PROTECTED]>

        * ClientScriptManager.cs: fixed: GetScriptLiteral escapes back-slash:


Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog  2007-02-26 09:59:57 UTC 
(rev 73418)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog  2007-02-26 10:21:12 UTC 
(rev 73419)
@@ -1,3 +1,7 @@
+2007-02-26 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+       * ClientScriptManager.cs: fixed: GetScriptLiteral escapes back-slash:
+
 2007-02-22 Igor Zelmanovich <[EMAIL PROTECTED]>
 
        * TemplateControl.cs: added missing property AppRelativeVirtualPath

Modified: trunk/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs     
2007-02-26 09:59:57 UTC (rev 73418)
+++ trunk/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs     
2007-02-26 10:21:12 UTC (rev 73419)
@@ -712,12 +712,14 @@
 #endif
                }
                
+               [MonoTODO ("optimize s.Replace")]
                internal static string GetScriptLiteral (object ob)
                {
                        if (ob == null)
                                return "null";
                        else if (ob is string) {
                                string s = (string)ob;
+                               s = s.Replace ("\\", "\\\\");
                                s = s.Replace ("\"", "\\\"");
                                return "\"" + s + "\"";
                        } else if (ob is bool) {

Modified: trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs 2007-02-26 
09:59:57 UTC (rev 73418)
+++ trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs 2007-02-26 
10:21:12 UTC (rev 73419)
@@ -47,6 +47,7 @@
 #else
        public abstract class TemplateControl : Control, INamingContainer {
 #endif
+               static Assembly _System_Web_Assembly = typeof 
(TemplateControl).Assembly;
                static object abortTransaction = new object ();
                static object commitTransaction = new object ();
                static object error = new object ();
@@ -125,9 +126,14 @@
                        if (!SupportAutoEvents || !AutoEventWireup)
                                return;
 
-                       Type type = GetType ();
                        foreach (string methodName in methodNames) {
-                               MethodInfo method = type.GetMethod (methodName, 
bflags);
+                               MethodInfo method = null;
+                               Type type;
+                               for (type = GetType (); type.Assembly != 
_System_Web_Assembly; type = type.BaseType) {
+                                       method = type.GetMethod (methodName, 
bflags);
+                                       if (method != null)
+                                               break;
+                               }
                                if (method == null)
                                        continue;
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to