From abce4ef5610f2960c2b5e6cd5f8d3111e7c6576d Mon Sep 17 00:00:00 2001 From: phasefx Date: Thu, 19 Mar 2009 18:33:47 +0000 Subject: [PATCH] fixes the missing xulG.new_tab issue. The problem was nested browsers/progress listeners git-svn-id: svn://svn.open-ils.org/ILS/trunk@12614 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/reports/oils_rpt_folder_window.js | 2 +- Open-ILS/xul/staff_client/chrome/content/main/menu.js | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.js b/Open-ILS/web/reports/oils_rpt_folder_window.js index b0c5e4d38b..d8532f5a72 100644 --- a/Open-ILS/web/reports/oils_rpt_folder_window.js +++ b/Open-ILS/web/reports/oils_rpt_folder_window.js @@ -371,7 +371,7 @@ oilsRptFolderWindow.prototype.showOutput = function(sched) { _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); diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu.js b/Open-ILS/xul/staff_client/chrome/content/main/menu.js index 217569eade..8130ab1c9a 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js +++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js @@ -400,7 +400,7 @@ main.menu.prototype = { ); 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 @@ main.menu.prototype = { 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 @@ main.menu.prototype = { 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 @@ main.menu.prototype = { ['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 @@ main.menu.prototype = { ); 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 @@ main.menu.prototype = { 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'); -- 2.11.0