[open-ils-commits] r12247 - trunk/Open-ILS/xul/staff_client/chrome/content/util (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-02-21 19:52:26 -0500 (Sat, 21 Feb 2009)
New Revision: 12247

Modified:
   trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.js
   trunk/Open-ILS/xul/staff_client/chrome/content/util/deck.js
Log:
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

Modified: trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.js	2009-02-22 00:51:03 UTC (rev 12246)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.js	2009-02-22 00:52:26 UTC (rev 12247)
@@ -122,7 +122,7 @@
 			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 @@
 						}
 						//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));
 					}
 				}
 			}

Modified: trunk/Open-ILS/xul/staff_client/chrome/content/util/deck.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/util/deck.js	2009-02-22 00:51:03 UTC (rev 12246)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/util/deck.js	2009-02-22 00:52:26 UTC (rev 12247)
@@ -55,7 +55,7 @@
 			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 @@
 		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');