From be10b3509247fa08f2124ccc84b1c22ea12fa808 Mon Sep 17 00:00:00 2001 From: phasefx Date: Wed, 12 May 2010 17:48:35 +0000 Subject: [PATCH] put spine label preview into a tab instead of a window. fixes it for xulrunner 1.9.2 git-svn-id: svn://svn.open-ils.org/ILS/trunk@16421 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../staff_client/server/cat/spine_labels.js | 35 +++++++------------ 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/cat/spine_labels.js b/Open-ILS/xul/staff_client/server/cat/spine_labels.js index f393fb921b..48ae6a00f8 100644 --- a/Open-ILS/xul/staff_client/server/cat/spine_labels.js +++ b/Open-ILS/xul/staff_client/server/cat/spine_labels.js @@ -231,7 +231,7 @@ var lw = Number($('lw').value) || 8; var ll = Number($('ll').value) || 9; /* spine label width and length */ var plw = Number($('plw').value) || 28; var pll = Number($('pll').value) || 9; /* pocket label width and length */ var html = ""; - html += "" + html += "" html += ""; html += "Spine Labels\n"; var nl = document.getElementsByAttribute('name','template'); @@ -267,29 +267,18 @@ } } html += ''; - JSAN.use('util.window'); var win = new util.window(); - var loc = ( urls.XUL_REMOTE_BROWSER ); - //+ '?url=' + window.escape('about:blank') + '&show_print_button=1&alternate_print=1&no_xulG=1&title=' + window.escape('Spine Labels'); - var w = win.open( loc, 'spine_preview', 'chrome,resizable,width=750,height=550'); - w.xulG = { - 'url' : 'about:blank', - 'show_print_button' : 1, - 'alternate_print' : 1, - 'no_xulG' : 1, - 'title' : $("catStrings").getString('staff.cat.spine_labels.preview.title'), - 'on_url_load' : function(b) { - try { - netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); - if (typeof w.xulG.written == 'undefined') { - w.xulG.written = true; - w.g.browser.get_content().document.write(html); - w.g.browser.get_content().document.close(); - } - } catch(E) { - alert(E); - } + var loc = ( urls.XUL_BROWSER ); + xulG.new_tab( + loc, + { + 'tab_name' : $("catStrings").getString('staff.cat.spine_labels.preview.title') + }, + { + 'url' : 'data:text/html,'+html, + 'show_print_button' : 1, + 'no_xulG' : 1 } - }; + ); } catch(E) { g.error.standard_unexpected_error_alert($("catStrings").getString('staff.cat.spine_labels.preview.std_unexpected_err'),E); } -- 2.43.2