Bug in javacript code, using window instead of document for checking if the script...

svn path=/trunk/mcs/; revision=107818

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index 4bb94178b53b31da091b8f5c155b93b0e3ca317d..cc225d4205f234fd50d10f2ade8a3d570416e709 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-10  Roei Erez  <roeie@mainsoft.com>
+
+       * ClientScriptManager.cs: Bug in javacript code, usind window scope instead of document.
+
 2008-07-11  Marek Habersack  <mhabersack@novell.com>
 
        * Control.cs: if adapter exists for the given control, use it for

diff --git a/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs b/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs
index 96abdc4ea9a79e73fa67da01e409c27f9d38ee91..b7b37c89507af2697bae821f66e69e1450d52a5b 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs
+++ b/mcs/class/System.Web/System.Web.UI/ClientScriptManager.cs
@@ -669,8 +669,8 @@ namespace System.Web.UI
                                                string scriptKey = "inc_" + (type.FullName + key).GetHashCode ().ToString ("X");
                                                writer.WriteLine ("<script type=\"text/javascript\">");
                                                writer.WriteLine (SCRIPT_BLOCK_START);
-                                               writer.WriteLine ("if (document.{0} == null) {{", scriptKey);
-                                               writer.WriteLine ("\tdocument.{0} = true", scriptKey);
+                                               writer.WriteLine ("if (!window.{0}) {{", scriptKey);
+                                               writer.WriteLine ("\twindow.{0} = true", scriptKey);
                                                writer.WriteLine ("\tdocument.write('<script src=\"{0}\" type=\"text/javascript\"><\\/script>'); }}", path);
                                                writer.WriteLine (SCRIPT_BLOCK_END);
                                                writer.WriteLine ("</script>");