Make developer-oriented preferences for the staff client optional, since some of...

I couldn't figure out how to get something like

	make DEBUG=1 build

to work, so I went with

	make devbuild

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

diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am
index d440c83..9180702 100644 (file)
--- a/Open-ILS/xul/staff_client/Makefile.am
+++ b/Open-ILS/xul/staff_client/Makefile.am
@@ -22,6 +22,9 @@ endif
 
 install-exec-local: $(OILSSERVER_INST)
 
+devbuild: build
+       @cp external/developers.js build/defaults/preferences/
+
 build: build_dir chrome2remote localize_manifest generated custom_skins open-ils stamp 
        @echo To test the staff client:
        @echo "  cd build/"

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 27ef91d..61b8f4c 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.js
@@ -297,8 +297,11 @@ function main_init() {
             document.getElementById('debug_gb').hidden = false;
         }
 
-        if (G.pref && G.pref.getBoolPref('open-ils.debug_options')) {
-            document.getElementById('debug_gb').hidden = false;
+        try {
+            if (G.pref && G.pref.getBoolPref('open-ils.debug_options')) {
+                document.getElementById('debug_gb').hidden = false;
+            }
+        } catch(E) {
         }
 
         window.title = authStrings.getFormattedString('staff.auth.titlebar.label', version);

diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
index bb80756..584b367 100644 (file)
--- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
+++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
@@ -48,17 +48,6 @@ pref("browser.popups.showPopupBlocker", false);
 pref("privacy.popups.disable_from_plugins",0);
 pref("privacy.popups.policy",0);
 
-// Developer options
-pref("browser.dom.window.dump.enabled",true);
-pref("javascript.options.strict",false);
-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);
 pref("browser.download.manager.showAlertOnComplete", true);
@@ -71,6 +60,8 @@ pref("browser.download.manager.openDelay", 0);
 pref("browser.download.manager.focusWhenStarting", false);
 pref("browser.download.manager.flashCount", 2); 
 
+// Developer options we want for all builds
+pref("browser.dom.window.dump.enabled",true);
 
 // For extension manager, etc.
 pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul");

diff --git a/Open-ILS/xul/staff_client/external/developers.js b/Open-ILS/xul/staff_client/external/developers.js
new file mode 100644 (file)
index 0000000..a3836c1
--- /dev/null
+++ b/Open-ILS/xul/staff_client/external/developers.js
@@ -0,0 +1,14 @@
+// Developer options
+pref("browser.dom.window.dump.enabled",true);
+pref("javascript.options.strict",true);
+pref("javascript.options.showInConsole",true);
+pref("nglayout.debug.disable_xul_cache",true);
+pref("nglayout.debug.disable_xul_fastload",true);
+pref("browser.xul.error_pages.enabled",true);
+pref("extensions.logging.enabled",true);
+pref("dom.report_all_js_exceptions",true);
+// This one is specific for Open-ILS; debug options on login window
+pref("open-ils.debug_options", true);
+
+
+