From 2b684a0676436659e2bb1c2e08884ac427e867a2 Mon Sep 17 00:00:00 2001 From: pines Date: Tue, 10 Jan 2006 04:42:05 +0000 Subject: [PATCH] fix nav buttons git-svn-id: svn://svn.open-ils.org/ILS/trunk@2667 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../chrome/content/evergreen/util/browser.js | 16 +++------------- .../chrome/content/evergreen/util/browser.xul | 4 ++-- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/Open-ILS/xul/staff_client/chrome/content/evergreen/util/browser.js b/Open-ILS/xul/staff_client/chrome/content/evergreen/util/browser.js index f5dc07ad49..08dfe933bd 100644 --- a/Open-ILS/xul/staff_client/chrome/content/evergreen/util/browser.js +++ b/Open-ILS/xul/staff_client/chrome/content/evergreen/util/browser.js @@ -86,20 +86,9 @@ util.browser.prototype = { try { netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); - /* - var cw = this.controller.view.browser_browser.contentWindow.wrappedJSObject; - var cd = this.controller.view.browser_browser.contentDocument; - dump('contentWindow.wrappedJSObject = ' + cw + '\n'); - dump('contentWindow.wrappedJSObject.wrappedJSObject = ' + cw.wrappedJSObject + '\n'); - dump('contentDocument = ' + cd + '\n'); - dump('contentWindow.wrappedJSObject.document = ' + cw.document + '\n'); - dump('contentWindow.wrappedJSObject.document.ownerDocument = ' + cw.document.ownerDocument + '\n'); - dump('contentWindow.wrappedJSObject.document.parentNode = ' + cw.document.parentNode + '\n'); - */ this.controller.view.browser_browser.contentWindow.wrappedJSObject.IAMXUL = true; if (window.xulG) { this.controller.view.browser_browser.contentWindow.wrappedJSObject.xulG = window.xulG; - dump('xulG = ' + js2JSON(xulG) + '\n'); dump('xulG = ' + js2JSON(this.controller.view.browser_browser.contentWindow.wrappedJSObject.xulG) + '\n'); } } catch(E) { @@ -112,6 +101,7 @@ util.browser.prototype = { }, 'updateNavButtons' : function() { + var obj = this; var s = ''; try { var n = obj.getWebNavigation(); s += ('webNavigation = ' + n + '\n'); @@ -132,8 +122,9 @@ util.browser.prototype = { obj.controller.view.cmd_back.setAttribute('disabled','true'); } } catch(E) { - s += E; + s += E + '\n'; } + dump(s); }, 'buildProgressListener' : function() { @@ -152,7 +143,6 @@ util.browser.prototype = { var s = ''; const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener; const nsIChannel = Components.interfaces.nsIChannel; - //obj.push_variables(); obj.updateNavButtons(); if (stateFlags == 65540 || stateFlags == 65537 || stateFlags == 65552) { return; } s = ('onStateChange: stateFlags = ' + stateFlags + ' status = ' + status + '\n'); if (stateFlags & nsIWebProgressListener.STATE_IS_REQUEST) { diff --git a/Open-ILS/xul/staff_client/chrome/content/evergreen/util/browser.xul b/Open-ILS/xul/staff_client/chrome/content/evergreen/util/browser.xul index ead7fca0db..ce6edc28f1 100644 --- a/Open-ILS/xul/staff_client/chrome/content/evergreen/util/browser.xul +++ b/Open-ILS/xul/staff_client/chrome/content/evergreen/util/browser.xul @@ -77,8 +77,8 @@ -