[open-ils-commits] r12241 - in trunk/Open-ILS/xul/staff_client: chrome components (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-02-21 19:39:56 -0500 (Sat, 21 Feb 2009)
New Revision: 12241

Modified:
   trunk/Open-ILS/xul/staff_client/chrome/venkman.jar
   trunk/Open-ILS/xul/staff_client/components/venkman-service.js
Log:
backporting from staff-client-experiment: upgrade venkman

Modified: trunk/Open-ILS/xul/staff_client/chrome/venkman.jar
===================================================================
(Binary files differ)

Modified: trunk/Open-ILS/xul/staff_client/components/venkman-service.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/components/venkman-service.js	2009-02-21 23:56:29 UTC (rev 12240)
+++ trunk/Open-ILS/xul/staff_client/components/venkman-service.js	2009-02-22 00:39:56 UTC (rev 12241)
@@ -89,7 +89,8 @@
     var ass = Components.classes[ASS_CONTRACTID].getService(nsIAppShellService);
     var window = ass.hiddenDOMWindow;
     window.openDialog("chrome://venkman/content/venkman.xul", "_blank",
-                      "chrome,menubar,toolbar,resizable,dialog=no", args);
+                      "chrome,menubar,toolbar,status,resizable,dialog=no",
+                      args);
 }
 
 function safeHTML(str)
@@ -106,12 +107,18 @@
                     
             case "&":
                 return "&";
+                    
+            case "'":
+                return "'";
+                    
+            case '"':
+                return """;
         }
 
         return "?";
     };
         
-    return String(str).replace(/[<>&]/g, replaceChars);
+    return String(str).replace(/[<>&"']/g, replaceChars);
 }
 
 /* Command Line handler service */
@@ -271,8 +278,12 @@
 
 JSDProtocolHandler.prototype.scheme = "x-jsd";
 JSDProtocolHandler.prototype.defaultPort = JSD_DEFAULT_PORT;
-JSDProtocolHandler.prototype.protocolFlags = nsIProtocolHandler.URI_NORELATIVE ||
+JSDProtocolHandler.prototype.protocolFlags = nsIProtocolHandler.URI_NORELATIVE |
                                              nsIProtocolHandler.URI_NOAUTH;
+if ("URI_DANGEROUS_TO_LOAD" in nsIProtocolHandler) {
+  JSDProtocolHandler.prototype.protocolFlags |=
+      nsIProtocolHandler.URI_DANGEROUS_TO_LOAD;
+}
 
 JSDProtocolHandler.prototype.allowPort =
 function jsdph_allowport (aPort, aScheme)