Upgrade Venkman to version 0.9.87.4

Have it launched from chrome scope
Add a open-ils.debug_options pref for showing debug options on the login window (an alternative to using a versionless build to do this)

git-svn-id: svn://svn.open-ils.org/ILS/branches/staff-client-experiment@12026 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 27e523c..3771991 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -565,6 +565,8 @@
 <!ENTITY staff.main.auth.debug.clear.accesskey "C">
 <!ENTITY staff.main.auth.debug.javascript "JavaScript Console">
 <!ENTITY staff.main.auth.debug.javascript.accesskey "J">
+<!ENTITY staff.main.auth.debug.debugger "Debugger">
+<!ENTITY staff.main.auth.debug.debugger.accesskey "D">
 <!ENTITY staff.main.auth.hostname "Hostname">
 <!ENTITY staff.main.auth.hostname.accesskey "H">
 <!ENTITY staff.main.auth.offline.caption "Offline Use">

diff --git a/Open-ILS/xul/staff_client/application.ini b/Open-ILS/xul/staff_client/application.ini
index a98b767..8e5c646 100644 (file)
--- a/Open-ILS/xul/staff_client/application.ini
+++ b/Open-ILS/xul/staff_client/application.ini
@@ -11,7 +11,7 @@ Name=open_ils_staff_client
 ;
 ; This field specifies your application's build ID (timestamp).  This field is
 ; required.
-BuildID=20081116
+BuildID=20090131
 ;
 ;
 ; This ID is just an example.  Every XUL app ought to have it's own unique ID.

diff --git a/Open-ILS/xul/staff_client/chrome/chrome.manifest b/Open-ILS/xul/staff_client/chrome/chrome.manifest
index cec0d7b..af124ae 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/chrome.manifest
+++ b/Open-ILS/xul/staff_client/chrome/chrome.manifest
@@ -2,6 +2,18 @@ content open_ils_staff_client content/
 locale open_ils_staff_client en-US locale/en-US/
 skin open_ils_staff_client open_ils_staff_client skin/
 locale branding en-US branding/locale/en-US/
-content venkman jar:venkman.jar!/content/venkman/
+
+style   chrome://global/content/customizeToolbar.xul    chrome://venkman/skin/venkman-overlay.css
+overlay chrome://messenger/content/messenger.xul        chrome://venkman/content/venkman-overlay.xul      application={3550f703-e582-4d05-9a08-453d09bdfdc6}
+overlay chrome://venkman/content/venkman-menus.xul      chrome://communicator/content/tasksOverlay.xul    application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+overlay chrome://communicator/content/tasksOverlay.xul  chrome://venkman/content/venkman-overlay.xul      application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+overlay chrome://calendar/content/calendar.xul          chrome://venkman/content/venkman-overlay.xul      application={718e30fb-e89b-41dd-9da7-e25a45638b28}
+overlay chrome://venkman/content/venkman.xul            chrome://communicator/content/utilityOverlay.xul  application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+content venkman-ff         jar:venkman.jar!/content/venkman/ff/
+content venkman            jar:venkman.jar!/content/venkman/
+content venkman            jar:venkman.jar!/content/venkman/ contentaccessible=yes
+skin    venkman modern/1.0 jar:venkman.jar!/skin/modern/venkman/
+content venkman-sm         jar:venkman.jar!/content/venkman/sm/
+overlay chrome://browser/content/browser.xul            chrome://venkman/content/venkman-overlay.xul      application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={a463f10c-3994-11da-9945-000d60ca027b}
 locale venkman en-US jar:venkman.jar!/locale/en-US/venkman/
-skin   venkman modern/1.0 jar:venkman.jar!/skin/modern/venkman/
+

diff --git a/Open-ILS/xul/staff_client/chrome/content/auth/controller.js b/Open-ILS/xul/staff_client/chrome/content/auth/controller.js
index d448397..a0d7756 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/auth/controller.js
+++ b/Open-ILS/xul/staff_client/chrome/content/auth/controller.js
@@ -60,6 +60,12 @@ auth.controller.prototype = {
                                                        obj.debug('js_console');
                                                }
                                        ],
+                    'cmd_debugger' : [
+                        ['command'],
+                        function() {
+                            start_debugger();
+                        }
+                    ],
                                        'cmd_override' : [
                                                ['command'],
                                                function() {

diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.js b/Open-ILS/xul/staff_client/chrome/content/main/main.js
index 6a71274..a963ad9 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.js
@@ -31,6 +31,23 @@ function clear_the_cache() {
        }
 }
 
+function toOpenWindowByType(inType, uri) { /* for Venkman */
+    try {
+       var winopts = "chrome,extrachrome,menubar,resizable,scrollbars,status,toolbar";
+       window.open(uri, "_blank", winopts);
+    } catch(E) {
+        alert(E); throw(E);
+    }
+}
+
+function start_debugger() {
+    setTimeout(
+        function() {
+            try { start_venkman(); } catch(E) { alert(E); }
+        }, 0
+    );
+};
+
 function main_init() {
        dump('entering main_init()\n');
        try {
@@ -47,6 +64,8 @@ function main_init() {
                }
                /////////////////////////////////////////////////////////////////////////////
 
+        var pref = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
+
                JSAN.errorLevel = "die"; // none, warn, or die
                JSAN.addRepository('..');
 
@@ -249,6 +268,11 @@ function main_init() {
                        version = 'versionless debug build';
                        document.getElementById('debug_gb').hidden = false;
                }
+
+        if (pref && pref.getBoolPref('open-ils.debug_options')) {
+                       document.getElementById('debug_gb').hidden = false;
+        }
+
         window.title = authStrings.getFormattedString('staff.auth.titlebar.label', version);
                var x = document.getElementById('about_btn');
                x.addEventListener(
@@ -322,10 +346,7 @@ function main_init() {
                        false
                );
 
-        var pref = Components.classes["@mozilla.org/preferences-service;1"]
-                .getService(Components.interfaces.nsIPrefBranch);
-
-               if ( found_ws_info_in_Achrome() && pref.getBoolPref("open-ils.write_in_user_chrome_directory") ) {
+               if ( found_ws_info_in_Achrome() && pref && pref.getBoolPref("open-ils.write_in_user_chrome_directory") ) {
                        //var hbox = x.parentNode; var b = document.createElement('button'); 
                        //b.setAttribute('label','Migrate legacy settings'); hbox.appendChild(b);
                        //b.addEventListener(

diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.xul b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
index 5347bcb..71c89e3 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
@@ -55,6 +55,7 @@
                dump("lang.version = &lang.version;" + '\n');
        </script>
 
+    <script type="text/javascript" src="chrome://venkman/content/venkman-overlay.js"/>
        <messagecatalog id="authStrings" src="chrome://open_ils_staff_client/locale/auth.properties"/>
        <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
@@ -67,6 +68,7 @@
                <command id="cmd_standalone_export"/>
                <command id="cmd_standalone_import"/>
                <command id="cmd_js_console"/>
+               <command id="cmd_debugger"/>
                <command id="cmd_clear_cache"/>
                <command id="cmd_test_server"/>
                <command id="cmd_ssl_exception" hidden="true"/>
@@ -177,6 +179,7 @@
                        <caption label="&staff.main.auth.debug.caption;"/>
                        <hbox>
                                <button label="&staff.main.auth.debug.javascript;" accesskey="&staff.main.auth.debug.javascript.accesskey;" command="cmd_js_console"/>
+                               <button label="&staff.main.auth.debug.debugger;" accesskey="&staff.main.auth.debug.debugger.accesskey;" command="cmd_debugger"/>
                                <button label="&staff.main.auth.debug.clear;" accesskey="&staff.main.auth.debug.clear.accesskey;" command="cmd_clear_cache"/>
                        </hbox>
                </groupbox>

diff --git a/Open-ILS/xul/staff_client/chrome/venkman.jar b/Open-ILS/xul/staff_client/chrome/venkman.jar
index 9aa7755..29c9500 100644 (file)
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 867b52a..bf75bbc 100644 (file)
--- 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 "&";
+                    
+            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 @@ 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)

diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
index 2190199..c772463 100644 (file)
--- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
+++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
@@ -50,6 +50,9 @@ pref("javascript.options.showInConsole",true);
 pref("nglayout.debug.disable_xul_cache",false);
 pref("nglayout.debug.disable_xul_fastload",false);
 pref("browser.xul.error_pages.enabled",true);
+// This one is specific for Open-ILS; debug options on login window
+pref("open-ils.debug_options", true);
+
 
 pref("browser.download.useDownloadDir", true);
 pref("browser.download.folderList", 0);

diff --git a/Open-ILS/xul/staff_client/server/main/menu_frame_menus.xul b/Open-ILS/xul/staff_client/server/main/menu_frame_menus.xul
index 7344214..c9ba44a 100644 (file)
--- a/Open-ILS/xul/staff_client/server/main/menu_frame_menus.xul
+++ b/Open-ILS/xul/staff_client/server/main/menu_frame_menus.xul
@@ -229,7 +229,7 @@
                                <menuitem label="&staff.main.menu.admin.extension_manager.label;" command="cmd_extension_manager"/>
                                <menuitem label="&staff.main.menu.admin.theme_manager.label;" command="cmd_theme_manager"/>
                                <menuitem label="&staff.main.menu.admin.about_config.label;" command="cmd_about_config"/>
-                               <menuitem label="&staff.main.menu.admin.venkman.label;" oncommand="try{start_venkman();}catch(E){alert(E);}"/>
+                               <menuitem label="&staff.main.menu.admin.venkman.label;" oncommand="try{xulG.window.win.start_debugger();}catch(E){alert(E);}"/>
                        </menupopup>
                </menu>
        </menupopup>