[gwt-contrib] [google-web-toolkit] r10498 committed - Cherry picking r10458 into releases/2.4 for issue 1483804

[codesite-noreply]

Revision: 10498
Author:   gwt.mirror...@gmail.com
Date:     Fri Aug  5 12:51:03 2011
Log:      Cherry picking r10458 into releases/2.4 for issue 1483804
http://code.google.com/p/google-web-toolkit/source/detail?r=10498

Modified:
 /releases/2.4/dev/core/src/com/google/gwt/core/ext/linker/impl/devmode.js
 /releases/2.4/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html

=======================================
---  
/releases/2.4/dev/core/src/com/google/gwt/core/ext/linker/impl/devmode.js	 
Wed May 18 13:47:13 2011
+++  
/releases/2.4/dev/core/src/com/google/gwt/core/ext/linker/impl/devmode.js	 
Fri Aug  5 12:51:03 2011
@@ -314,11 +314,19 @@
   if ($errFn) {
     $errFn($moduleName);
   } else {
-    __gwt_displayGlassMessage("Plugin failed to connect to Development  
Mode server at " + codeServer,
+    __gwt_displayGlassMessage("Plugin failed to connect to Development  
Mode server at " +
+        simpleEscape(codeServer),
         "Follow the underlying troubleshooting instructions");
      
loadIframe("http://code.google.com/p/google-web-toolkit/wiki/TroubleshootingOOPHM";);
   }
 }
+
+function simpleEscape(originalString) {
+  return originalString.replace("&","&")
+    .replace("<","&lt;")
+    .replace(">","&gt;")
+    .replace("\"","&quot;");
+}

 function tryConnectingToPlugin(sessionId, url) {
   // Note that the order is important
=======================================
---  
/releases/2.4/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html	 
Wed May 18 13:47:13 2011
+++  
/releases/2.4/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html	 
Fri Aug  5 12:51:03 2011
@@ -295,13 +295,21 @@
       if (errFn) {
         errFn(modName);
       } else {
-        __gwt_displayGlassMessage("Plugin failed to connect to Development  
Mode server at " + $hosted,
+        __gwt_displayGlassMessage("Plugin failed to connect to Development  
Mode server at " +
+            simpleEscape($hosted),
             "Follow the underlying troubleshooting instructions");
          
loadIframe("http://code.google.com/p/google-web-toolkit/wiki/TroubleshootingOOPHM";);
       }
     }
   }
 }
+
+function simpleEscape(originalString) {
+  return originalString.replace("&","&amp;")
+    .replace("<","&lt;")
+    .replace(">","&gt;")
+    .replace("\"","&quot;");
+}

 window.onunload = function() {
 };

--
http://groups.google.com/group/Google-Web-Toolkit-Contributors