[open-ils-commits] r12026 - in branches/staff-client-experiment/Open-ILS: web/opac/locale/en-US xul/staff_client xul/staff_client/chrome xul/staff_client/chrome/content/auth xul/staff_client/chrome/content/main xul/staff_client/components xul/staff_client/defaults/preferences xul/staff_client/server/main
svn at svn.open-ils.org
svn at svn.open-ils.org
Sat Jan 31 18:23:06 EST 2009
Author: phasefx
Date: 2009-01-31 18:23:01 -0500 (Sat, 31 Jan 2009)
New Revision: 12026
Modified:
branches/staff-client-experiment/Open-ILS/web/opac/locale/en-US/lang.dtd
branches/staff-client-experiment/Open-ILS/xul/staff_client/application.ini
branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/chrome.manifest
branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/content/auth/controller.js
branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/content/main/main.js
branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/content/main/main.xul
branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/venkman.jar
branches/staff-client-experiment/Open-ILS/xul/staff_client/components/venkman-service.js
branches/staff-client-experiment/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame_menus.xul
Log:
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)
Modified: branches/staff-client-experiment/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- branches/staff-client-experiment/Open-ILS/web/opac/locale/en-US/lang.dtd 2009-01-31 22:04:33 UTC (rev 12025)
+++ branches/staff-client-experiment/Open-ILS/web/opac/locale/en-US/lang.dtd 2009-01-31 23:23:01 UTC (rev 12026)
@@ -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">
Modified: branches/staff-client-experiment/Open-ILS/xul/staff_client/application.ini
===================================================================
--- branches/staff-client-experiment/Open-ILS/xul/staff_client/application.ini 2009-01-31 22:04:33 UTC (rev 12025)
+++ branches/staff-client-experiment/Open-ILS/xul/staff_client/application.ini 2009-01-31 23:23:01 UTC (rev 12026)
@@ -11,7 +11,7 @@
;
; 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.
Modified: branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/chrome.manifest
===================================================================
--- branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/chrome.manifest 2009-01-31 22:04:33 UTC (rev 12025)
+++ branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/chrome.manifest 2009-01-31 23:23:01 UTC (rev 12026)
@@ -2,6 +2,18 @@
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/
+
Modified: branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/content/auth/controller.js
===================================================================
--- branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/content/auth/controller.js 2009-01-31 22:04:33 UTC (rev 12025)
+++ branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/content/auth/controller.js 2009-01-31 23:23:01 UTC (rev 12026)
@@ -60,6 +60,12 @@
obj.debug('js_console');
}
],
+ 'cmd_debugger' : [
+ ['command'],
+ function() {
+ start_debugger();
+ }
+ ],
'cmd_override' : [
['command'],
function() {
Modified: branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/content/main/main.js
===================================================================
--- branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/content/main/main.js 2009-01-31 22:04:33 UTC (rev 12025)
+++ branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/content/main/main.js 2009-01-31 23:23:01 UTC (rev 12026)
@@ -31,6 +31,23 @@
}
}
+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 @@
}
/////////////////////////////////////////////////////////////////////////////
+ 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 @@
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 @@
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(
Modified: branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/content/main/main.xul
===================================================================
--- branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/content/main/main.xul 2009-01-31 22:04:33 UTC (rev 12025)
+++ branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/content/main/main.xul 2009-01-31 23:23:01 UTC (rev 12026)
@@ -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>
Modified: branches/staff-client-experiment/Open-ILS/xul/staff_client/chrome/venkman.jar
===================================================================
(Binary files differ)
Modified: branches/staff-client-experiment/Open-ILS/xul/staff_client/components/venkman-service.js
===================================================================
--- branches/staff-client-experiment/Open-ILS/xul/staff_client/components/venkman-service.js 2009-01-31 22:04:33 UTC (rev 12025)
+++ branches/staff-client-experiment/Open-ILS/xul/staff_client/components/venkman-service.js 2009-01-31 23:23:01 UTC (rev 12026)
@@ -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)
Modified: branches/staff-client-experiment/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
===================================================================
--- branches/staff-client-experiment/Open-ILS/xul/staff_client/defaults/preferences/prefs.js 2009-01-31 22:04:33 UTC (rev 12025)
+++ branches/staff-client-experiment/Open-ILS/xul/staff_client/defaults/preferences/prefs.js 2009-01-31 23:23:01 UTC (rev 12026)
@@ -50,7 +50,10 @@
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);
pref("browser.download.manager.showAlertOnComplete", true);
Modified: branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame_menus.xul
===================================================================
--- branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame_menus.xul 2009-01-31 22:04:33 UTC (rev 12025)
+++ branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame_menus.xul 2009-01-31 23:23:01 UTC (rev 12026)
@@ -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>
More information about the open-ils-commits
mailing list