From 6fc5b1e3c7c1ba462e48fb14e12179c3b88c43bc Mon Sep 17 00:00:00 2001 From: phasefx Date: Fri, 23 Jun 2006 19:21:04 +0000 Subject: [PATCH] rollback. Need to retackle print from modal window bug git-svn-id: svn://svn.open-ils.org/ILS/trunk@4757 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/server/patron/bills.js | 36 +++++++++--------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/patron/bills.js b/Open-ILS/xul/staff_client/server/patron/bills.js index 88e0144771..ab5c156501 100644 --- a/Open-ILS/xul/staff_client/server/patron/bills.js +++ b/Open-ILS/xul/staff_client/server/patron/bills.js @@ -152,9 +152,9 @@ patron.bills.prototype = { urls.XUL_PATRON_BILL_WIZARD + '?patron_id=' + window.escape(obj.patron_id), 'billwizard', - 'chrome,resizable' + 'chrome,resizable,modal' ); - w.addEventListener('unload',function(){ obj.refresh(); },false); + obj.refresh(); } catch(E) { obj.error.standard_unexpected_error_alert('bills -> cmd_bill_wizard',E); } @@ -171,12 +171,9 @@ patron.bills.prototype = { urls.XUL_PATRON_BILL_HISTORY + '?patron_id=' + window.escape(obj.patron_id), 'billhistory', - 'chrome,resizable' + 'chrome,resizable,modal' ); - w.addEventListener('unload',function() { - obj.OpenILS.data.init({'via':'stash'}); - if (obj.OpenILS.data.temp == 'refresh') { obj.refresh(); } - },false); + obj.OpenILS.data.init({'via':'stash'}); if (obj.OpenILS.data.temp == 'refresh') { obj.refresh(); } } catch(E) { obj.error.standard_unexpected_error_alert('bills -> cmd_bill_history',E); } @@ -193,12 +190,9 @@ patron.bills.prototype = { urls.XUL_PATRON_BILL_HISTORY + '?current=1&patron_id=' + window.escape(obj.patron_id), 'billhistory', - 'chrome,resizable' + 'chrome,resizable,modal' ); - w.addEventListener('unload',function() { - obj.OpenILS.data.init({'via':'stash'}); - if (obj.OpenILS.data.temp == 'refresh') { obj.refresh(); } - }, false); + obj.OpenILS.data.init({'via':'stash'}); if (obj.OpenILS.data.temp == 'refresh') { obj.refresh(); } } catch(E) { obj.error.standard_unexpected_error_alert('bills -> cmd_alternate_view',E); } @@ -806,19 +800,17 @@ patron.bills.prototype = { 'command', function(ev) { JSAN.use('util.window'); var w = new util.window(); - var wf = w.open( + w.open( urls.XUL_PATRON_BILL_DETAILS + '?patron_id=' + window.escape(obj.patron_id) + '&mbts_id=' + window.escape(my.mobts.id()), 'test' + my.mobts.id(), - 'chrome,resizable' + 'modal,chrome,resizable' ); - wf.addEventListener('unload',function(){ - obj.OpenILS.data.init({'via':'stash'}); - if (obj.OpenILS.data.temp == 'refresh') { - obj.refresh(); - } - },false); + obj.OpenILS.data.init({'via':'stash'}); + if (obj.OpenILS.data.temp == 'refresh') { + obj.refresh(); + } }, false @@ -837,9 +829,9 @@ patron.bills.prototype = { + '?patron_id=' + window.escape(obj.patron_id) + '&xact_id=' + window.escape( my.mobts.id() ), 'billwizard', - 'chrome,resizable' + 'chrome,resizable,modal' ); - w.addEventListener('unload',function(){ obj.refresh(); },false); + obj.refresh(); }, false ); -- 2.11.0