From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Sun, 22 Feb 2009 00:39:56 +0000 (+0000)
Subject: backporting from staff-client-experiment: upgrade venkman
X-Git-Tag: sprint4-merge-nov22~10765
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=38b8be6e50ff1e9e210a2eb308db9b1dcda15cda;p=working%2FEvergreen.git

backporting from staff-client-experiment: upgrade venkman

git-svn-id: svn://svn.open-ils.org/ILS/trunk@12241 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/xul/staff_client/chrome/venkman.jar b/Open-ILS/xul/staff_client/chrome/venkman.jar
index 9aa7755d64..29c9500dc9 100644
Binary files a/Open-ILS/xul/staff_client/chrome/venkman.jar and b/Open-ILS/xul/staff_client/chrome/venkman.jar differ
diff --git a/Open-ILS/xul/staff_client/components/venkman-service.js b/Open-ILS/xul/staff_client/components/venkman-service.js
index 867b52a291..bf75bbc5c5 100644
--- a/Open-ILS/xul/staff_client/components/venkman-service.js
+++ b/Open-ILS/xul/staff_client/components/venkman-service.js
@@ -89,7 +89,8 @@ function openDebuggerWindow(args)
     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 @@ function safeHTML(str)
                     
             case "&":
                 return "&amp;";
+                    
+            case "'":
+                return "&#39;";
+                    
+            case '"':
+                return "&quot;";
         }
 
         return "?";
     };
         
-    return String(str).replace(/[<>&]/g, replaceChars);
+    return String(str).replace(/[<>&"']/g, replaceChars);
 }
 
 /* Command Line handler service */
@@ -271,8 +278,12 @@ function JSDProtocolHandler()
 
 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)