From 2d7d7eff716778f747a60a4b5427a2a1cfdfe76b Mon Sep 17 00:00:00 2001 From: Jason Etheridge Date: Mon, 28 Mar 2011 16:55:35 -0400 Subject: [PATCH] change xulG.fromBack() into a simple xulG.fromBack boolean variable. true if page was precipitated by the Back button, false otherwise (and that includes Reloads) Signed-off-by: Jason Etheridge --- Open-ILS/xul/staff_client/chrome/content/util/browser.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Open-ILS/xul/staff_client/chrome/content/util/browser.js b/Open-ILS/xul/staff_client/chrome/content/util/browser.js index ad55b3d6d9..63b00bec39 100644 --- a/Open-ILS/xul/staff_client/chrome/content/util/browser.js +++ b/Open-ILS/xul/staff_client/chrome/content/util/browser.js @@ -15,6 +15,7 @@ util.browser.prototype = { 'lock_reload' : false, // as opposed to lock 'n load :) 'back_button_clicked' : false, + 'from_back' : false, 'init' : function( params ) { @@ -270,14 +271,7 @@ util.browser.prototype = { cw.IAMXUL = true; cw.XUL_BUILD_ID = '/xul/server/'.split(/\//)[2]; cw.xulG = obj.passthru_content_params || {}; - cw.xulG.fromBack = function() { - if (obj.back_button_clicked) { - obj.back_button_clicked = false; - return true; - } else { - return false; - } - } + cw.xulG.fromBack = obj.from_back; if (!cw.xulG.set_tab) { cw.xulG.set_tab = function(a,b,c) { return window.xulG.set_tab(a,b,c); }; } if (!cw.xulG.new_tab) { cw.xulG.new_tab = function(a,b,c) { return window.xulG.new_tab(a,b,c); }; } if (!cw.xulG.close_tab) { cw.xulG.close_tab = function(a) { return window.xulG.close_tab(a); }; } @@ -462,6 +456,8 @@ util.browser.prototype = { } if (stateFlags & nsIWebProgressListener.STATE_START) { s += ('\tSTATE_START\n'); + obj.from_back = obj.back_button_clicked; + obj.back_button_clicked = false; } if (stateFlags & nsIWebProgressListener.STATE_REDIRECTING) { s += ('\tSTATE_REDIRECTING\n'); -- 2.11.0