From 43c371320c1cdd55682a2cdda03da57b337162fc Mon Sep 17 00:00:00 2001 From: senator Date: Mon, 4 Apr 2011 16:37:18 +0000 Subject: [PATCH] Booking: in support of r19944, backport newer openils.XUL.newTabEasy() from trunk as well git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@19947 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/js/dojo/openils/XUL.js | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/Open-ILS/web/js/dojo/openils/XUL.js b/Open-ILS/web/js/dojo/openils/XUL.js index 00dfdc52bd..9511702959 100644 --- a/Open-ILS/web/js/dojo/openils/XUL.js +++ b/Open-ILS/web/js/dojo/openils/XUL.js @@ -35,7 +35,9 @@ if(!dojo._hasResource["openils.XUL"]) { xulG.new_tab(path, tabInfo, options); } - openils.XUL.newTabEasy = function(url, tab_name, extra_content_params) { + openils.XUL.newTabEasy = function( + url, tab_name, extra_content_params, wrap_in_browser + ) { var content_params = { "session": openils.User.authtoken, "authtime": openils.User.authtime @@ -51,9 +53,20 @@ if(!dojo._hasResource["openils.XUL"]) { if (extra_content_params) dojo.mixin(content_params, extra_content_params); - xulG.new_tab( - xulG.url_prefix(url), {"tab_name": tab_name}, content_params - ); + var loc = xulG.url_prefix(url); + + if (wrap_in_browser) { + loc = urls.XUL_BROWSER + "?url=" + window.escape(loc); + content_params = dojo.mixin( + { + "no_xulG": false, "show_print_button": true, + "show_nav_buttons": true, + "passthru_content_params": extra_content_params + }, content_params + ); + } + + xulG.new_tab(loc, {"tab_name": tab_name}, content_params); }; /** -- 2.11.0