From: phasefx Date: Sun, 22 Feb 2009 00:52:26 +0000 (+0000) Subject: backporting from staff-client-experiment: we're starting to put functions, DOM nodes... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=bd77aadc32a943397cc8872833c501f44fbc4f11;p=evergreen%2Ftadl.git backporting from staff-client-experiment: we're starting to put functions, DOM nodes, and recursrive data structures into xulG now, so now js2JSON in log statements here git-svn-id: svn://svn.open-ils.org/ILS/trunk@12247 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/xul/staff_client/chrome/content/util/browser.js b/Open-ILS/xul/staff_client/chrome/content/util/browser.js index 35af4e6593..bf939d1d93 100644 --- a/Open-ILS/xul/staff_client/chrome/content/util/browser.js +++ b/Open-ILS/xul/staff_client/chrome/content/util/browser.js @@ -122,7 +122,7 @@ util.browser.prototype = { cw.xulG.set_tab = window.xulG.set_tab; cw.xulG.new_tab = window.xulG.new_tab; cw.xulG.url_prefix = window.xulG.url_prefix; - try { s += ('******** cw = ' + cw + ' cw.xulG = ' + js2JSON(cw.xulG) + '\n'); } catch(E) { s+=E + '\n'; } + try { s += ('******** cw = ' + cw + ' cw.xulG = ' + (cw.xulG) + '\n'); } catch(E) { s+=E + '\n'; } obj.error.sdump('D_BROWSER',s); } catch(E) { this.error.sdump('D_ERROR','util.browser.push_variables: ' + E + '\n'); @@ -250,7 +250,7 @@ util.browser.prototype = { } //obj.error.sdump('D_BROWSER',s); } catch(E) { - obj.error.sdump('D_ERROR','util.browser.progresslistener.onstatechange: ' + js2JSON(E)); + obj.error.sdump('D_ERROR','util.browser.progresslistener.onstatechange: ' + (E)); } } } diff --git a/Open-ILS/xul/staff_client/chrome/content/util/deck.js b/Open-ILS/xul/staff_client/chrome/content/util/deck.js index 29b5b4c3e7..ad2274d718 100644 --- a/Open-ILS/xul/staff_client/chrome/content/util/deck.js +++ b/Open-ILS/xul/staff_client/chrome/content/util/deck.js @@ -55,7 +55,7 @@ util.deck.prototype = { if (content_params) { try { netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); - this.error.sdump('D_DECK', 'set_iframe\nurl = ' + url + '\nframe.contentWindow = ' + iframe.contentWindow + '\n' + 'content_params = ' + js2JSON(content_params) ); + this.error.sdump('D_DECK', 'set_iframe\nurl = ' + url + '\nframe.contentWindow = ' + iframe.contentWindow + '\n' + 'content_params = ' + (content_params) ); var cw = iframe.contentWindow; if (typeof iframe.contentWindow.wrappedJSObject != 'undefined') cw = iframe.contentWindow.wrappedJSObject; cw.IAMXUL = true; cw.xulG = content_params; @@ -91,11 +91,11 @@ util.deck.prototype = { if (content_params) { try { netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); - this.error.sdump('D_DECK', 'new_iframe\nurl = ' + url + '\nframe.contentWindow = ' + iframe.contentWindow + '\n' + 'content_params = ' + js2JSON(content_params) ); + this.error.sdump('D_DECK', 'new_iframe\nurl = ' + url + '\nframe.contentWindow = ' + iframe.contentWindow + '\n' + 'content_params = ' + (content_params) ); var cw = iframe.contentWindow; if (typeof iframe.contentWindow.wrappedJSObject != 'undefined') cw = iframe.contentWindow.wrappedJSObject; cw.IAMXUL = true; cw.xulG = content_params; - this.error.sdump('D_DECK', 'cw = ' + cw + ' cw.xulG = ' + js2JSON(cw.xulG) ); + this.error.sdump('D_DECK', 'cw = ' + cw + ' cw.xulG = ' + (cw.xulG) ); setTimeout( function() { if (typeof cw.default_focus == 'function') cw.default_focus(); }, 0 ); } catch(E) { this.error.sdump('D_ERROR','E: ' + E + '\n');