From e9060ce5eb7f40f0028f76a98339d1e5b25d610a Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 29 Oct 2014 17:09:40 -0400 Subject: [PATCH] Integrate patches from launchpad bug 1086458 related to staff client memory leak. Cross-port: f1aee81 Conflicts: Open-ILS/xul/staff_client/server/circ/checkout.js --- Open-ILS/xul/staff_client/chrome/content/main/menu.js | 13 +++++++++++++ Open-ILS/xul/staff_client/chrome/content/util/print.js | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) 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 67c7ef6d49..6014d569ac 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js +++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js @@ -1868,6 +1868,19 @@ main.menu.prototype = { obj.controller.view.tabscroller = window.document.getElementById('main_tabs_scrollbox'); obj.sort_menu(document.getElementById('main.menu.admin'), true); + document.addEventListener( + 'refresh_checkout', + function() { + try { + obj.set_tab(obj.url_prefix('XUL_PATRON_BARCODE_ENTRY')); + } catch(E) { + obj.error.sdump('D_ERROR','tab_refresh_checkout_handler: ' + js2JSON(E)); + } + } + , + false, + true + ); document.addEventListener( 'refresh_checkout', diff --git a/Open-ILS/xul/staff_client/chrome/content/util/print.js b/Open-ILS/xul/staff_client/chrome/content/util/print.js index 60a576d7e0..e257ce9a24 100644 --- a/Open-ILS/xul/staff_client/chrome/content/util/print.js +++ b/Open-ILS/xul/staff_client/chrome/content/util/print.js @@ -115,7 +115,7 @@ util.print.prototype = { var obj = this; - obj.data.last_print = { 'msg' : msg, 'params' : params, 'context' : this.context}; + obj.data.last_print = js2JSON({ 'msg' : msg, 'params' : params, 'context' : this.context}); obj.data.stash('last_print'); var silent = false; -- 2.11.0