From 8fa2c0020b5ecb95cd35fa0997e210f92306faa2 Mon Sep 17 00:00:00 2001 From: "hewitt%netscape.com" Date: Fri, 1 Feb 2002 23:09:42 +0000 Subject: [PATCH] 110001 - onpagehide should not fire events when traversing back in the wizard, r=racham, sr=blake git-svn-id: svn://10.0.0.236/trunk@113458 18797224-902f-48f8-a5cc-f745e15eee43 --- .../global/resources/content/bindings/wizard.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mozilla/xpfe/global/resources/content/bindings/wizard.xml b/mozilla/xpfe/global/resources/content/bindings/wizard.xml index b3519fb855d..d9075793495 100644 --- a/mozilla/xpfe/global/resources/content/bindings/wizard.xml +++ b/mozilla/xpfe/global/resources/content/bindings/wizard.xml @@ -186,8 +186,10 @@ if (!this.canRewind) return; - if (this.currentPage && !this._fireEvent(this.currentPage, "pagehide") - && !this._fireEvent(this.currentPage, "pagerewound")) + if (this.currentPage && !this._fireEvent(this.currentPage, "pagehide")) + return; + + if (this.currentPage && !this._fireEvent(this.currentPage, "pagerewound")) return; if (!this._fireEvent(this, "wizardback")) @@ -206,10 +208,12 @@ if (!this.canAdvance) return; - if (this.currentPage && !this._fireEvent(this.currentPage, "pagehide") - && !this._fireEvent(this.currentPage, "pageadvanced")) + if (this.currentPage && !this._fireEvent(this.currentPage, "pagehide")) return; + if (this.currentPage && !this._fireEvent(this.currentPage, "pageadvanced")) + return; + if (this.onLastPage) { if (this._fireEvent(this, "wizardfinish")) window.setTimeout(function() {window.close();}, 1);