let's silence some debugging output, add in a global convenience function, and correc...

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

diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js b/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
index aa82a3c..125201a 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
@@ -1,3 +1,5 @@
+       function $(id) { return document.getElementById(id); }
+
        function ses(a) {
                JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
                switch(a) {
@@ -61,16 +63,16 @@
        function xul_param(param_name,_params) {
                /* By default, this function looks for a CGI-style query param identified by param_name.  If one isn't found, it then looks in xulG.  If one still isn't found, and _params.stash_name is true, it looks in the global xpcom stash for the field identified by stash_name.  If _params.concat is true, then it looks in all these places and concatenates the results.  There are also options for converting JSON to javascript objects, and clearing the xpcom stash_name field after retrieval.  Also added, ability to search a specific spot in the xpcom stash that implements a stack to hold xulG's for modal windows */
                try {
-                       dump('xul_param('+param_name+','+js2JSON(_params)+')\n');
+                       //dump('xul_param('+param_name+','+js2JSON(_params)+')\n');
                        var value = undefined; if (!_params) _params = {};
                        if (typeof _params.no_cgi == 'undefined') {
                                var cgi = new CGI();
                                if (cgi.param(param_name)) {
                                        var x = cgi.param(param_name);
-                                       dump('\tfound via location.href = ' + x + '\n');
+                                       //dump('\tfound via location.href = ' + x + '\n');
                                        if (typeof _params.JSON2js_if_cgi != 'undefined') {
                                                x = JSON2js( x );
-                                               dump('\tJSON2js = ' + x + '\n');
+                                               //dump('\tJSON2js = ' + x + '\n');
                                        }
                                        if (typeof _params.concat == 'undefined') {
                                                //alert(param_name + ' x = ' + x);
@@ -89,17 +91,17 @@
                                if (typeof _params.modal_xulG != 'undefined') {
                                        JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
                                        var key = location.pathname + location.search + location.hash;
-                                       dump('xul_param, considering modal key = ' + key + '\n');
+                                       //dump('xul_param, considering modal key = ' + key + '\n');
                                        if (typeof data.modal_xulG_stack != 'undefined' && typeof data.modal_xulG_stack[key] != 'undefined') {
                                                xulG = data.modal_xulG_stack[key][ data.modal_xulG_stack[key].length - 1 ];
                                        }
                                }
                                if (typeof xulG == 'object' && typeof xulG[ param_name ] != 'undefined') {
                                        var x = xulG[ param_name ];
-                                       dump('\tfound via xulG = ' + x + '\n');
+                                       //dump('\tfound via xulG = ' + x + '\n');
                                        if (typeof _params.JSON2js_if_xulG != 'undefined') {
                                                x = JSON2js( x );
-                                               dump('\tJSON2js = ' + x + '\n');
+                                               //dump('\tJSON2js = ' + x + '\n');
                                        }
                                        if (typeof _params.concat == 'undefined') {
                                                //alert(param_name + ' x = ' + x);
@@ -120,10 +122,10 @@
                                        JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
                                        if (typeof data[ _params.stash_name ] != 'undefined') {
                                                var x = data[ _params.stash_name ];
-                                               dump('\tfound via xpcom = ' + x + '\n');
+                                               //dump('\tfound via xpcom = ' + x + '\n');
                                                if (typeof _params.JSON2js_if_xpcom != 'undefined') {
                                                        x = JSON2js( x );
-                                                       dump('\tJSON2js = ' + x + '\n');
+                                                       //dump('\tJSON2js = ' + x + '\n');
                                                }
                                                if (_params.clear_xpcom) { 
                                                        data[ _params.stash_name ] = undefined; data.stash( _params.stash_name ); 

diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
index a47d4b3..4b9b936 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
@@ -4,7 +4,7 @@
 <overlay id="openils_util_overlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-       <script>dump('Loading OpenILS/util_overlay.xul\n');</script>
+       <script>dump('Loading OpenILS/util_overlay_offline.xul\n');</script>
        <scripts id="openils_util_scripts">
                <script type="text/javascript" src="../main/constants.js" />
                <script type="text/javascript" src="util/utils.js" />
@@ -12,7 +12,7 @@
                <script type="text/javascript" src="util/md5.js" />
                <script type="text/javascript" src="util/JSON.js" />
        </scripts>
-       <script>dump('Loaded OpenILS/util_overlay.xul\n');</script>
+       <script>dump('Loaded OpenILS/util_overlay_offline.xul\n');</script>
 
 </overlay>