[open-ils-commits] r12614 - in trunk/Open-ILS: web/reports xul/staff_client/chrome/content/main (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-03-19 14:33:47 -0400 (Thu, 19 Mar 2009)
New Revision: 12614

Modified:
   trunk/Open-ILS/web/reports/oils_rpt_folder_window.js
   trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
Log:
fixes the missing xulG.new_tab issue.  The problem was nested browsers/progress listeners

Modified: trunk/Open-ILS/web/reports/oils_rpt_folder_window.js
===================================================================
--- trunk/Open-ILS/web/reports/oils_rpt_folder_window.js	2009-03-19 16:36:01 UTC (rev 12613)
+++ trunk/Open-ILS/web/reports/oils_rpt_folder_window.js	2009-03-19 18:33:47 UTC (rev 12614)
@@ -371,7 +371,7 @@
 			_debug("launching report output view at URL: " + url);
 			if(isXUL()) 
 				xulG.new_tab('/xul/server/util/rbrowser.xul?url=' + url,  /* this comes from urls.XUL_REMOTE_BROWSER */
-					{tab_name: dojo.string.substitute( rpt_strings.FOLDER_WINDOW_REPORT_OUTPUT, [r.name()] ), browser:true},
+					{tab_name: dojo.string.substitute( rpt_strings.FOLDER_WINDOW_REPORT_OUTPUT, [r.name()] ), browser:false},
 					{no_xulG:false, show_nav_buttons:true, show_print_button:true});
 			else {
 				//goTo(url);

Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js	2009-03-19 16:36:01 UTC (rev 12613)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js	2009-03-19 18:33:47 UTC (rev 12614)
@@ -400,7 +400,7 @@
 					);
 					obj.set_tab( 
 						loc, 
-						{'tab_name' : offlineStrings.getString('menu.cmd_local_admin.tab'), 'browser' : true }, 
+						{'tab_name' : offlineStrings.getString('menu.cmd_local_admin.tab'), 'browser' : false }, 
 						{ 'no_xulG' : false, 'show_nav_buttons' : true, 'show_print_button' : true } 
 					);
 
@@ -422,7 +422,7 @@
                         window.escape(urls.VANDELAY+'?ses='+window.escape(ses()));
 					obj.set_tab( 
 						loc, 
-						{'tab_name' : offlineStrings.getString('menu.cmd_open_vandelay.tab'), 'browser' : true }, 
+						{'tab_name' : offlineStrings.getString('menu.cmd_open_vandelay.tab'), 'browser' : false }, 
 						{'no_xulG' : false, 'show_print_button' : false } 
 					);
 
@@ -436,7 +436,7 @@
                         window.escape(urls.CONIFY+'?ses='+window.escape(ses()));
 					obj.set_tab( 
 						loc, 
-						{'tab_name' : offlineStrings.getString('menu.cmd_open_conify.tab'), 'browser' : true }, 
+						{'tab_name' : offlineStrings.getString('menu.cmd_open_conify.tab'), 'browser' : false }, 
 						{'no_xulG' : false, 'show_print_button' : false } 
 					);
 
@@ -652,7 +652,7 @@
 				['oncommand'],
 				function() {
 					obj.data.stash_retrieve();
-					obj.set_tab(obj.url_prefix(urls.TEST_XUL) + '?ses='+window.escape(ses()),{ 'browser' : true },{});
+					obj.set_tab(obj.url_prefix(urls.TEST_XUL) + '?ses='+window.escape(ses()),{ 'browser' : false },{});
 				}
 			],
 			'cmd_console' : [
@@ -694,7 +694,7 @@
 					);
 					obj.set_tab( 
 						loc, 
-						{'tab_name' : offlineStrings.getString('menu.cmd_public_opac.tab'), 'browser' : true}, 
+						{'tab_name' : offlineStrings.getString('menu.cmd_public_opac.tab'), 'browser' : false}, 
 						{ 'no_xulG' : true, 'show_nav_buttons' : true, 'show_print_button' : true } 
 					);
 				}
@@ -1008,7 +1008,8 @@
 		
 		var frame;
 		try {
-			if (params && typeof params.browser != 'undefined') {
+            if (typeof params.browser == 'undefined') params.browser = false;
+			if (params.browser) {
 				obj.id_incr++;
 				frame = this.w.document.createElement('browser');
 				frame.setAttribute('flex','1');