From c4b6a073452c090543eef8daabdaa32f3e20e97a Mon Sep 17 00:00:00 2001 From: "neil%parkwaycc.co.uk" Date: Wed, 31 Aug 2005 21:00:40 +0000 Subject: [PATCH] Bug 302575 URL bar gets confused about which URI is loaded r=bz sr=darin --- toolkit/content/widgets/browser.xml | 38 ++++++++++++++++--- .../resources/content/bindings/browser.xml | 38 ++++++++++++++++--- 2 files changed, 64 insertions(+), 12 deletions(-) diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml index 9cc87565fad0..d02beb4c04d9 100644 --- a/toolkit/content/widgets/browser.xml +++ b/toolkit/content/widgets/browser.xml @@ -88,8 +88,15 @@ @@ -98,8 +105,15 @@ @@ -167,7 +181,13 @@ } } this.mIconURL = null; - this.webNavigation.loadURI(aURI, aFlags, aReferrerURI, aPostData, null); + try { + this.userTypedClear++; + this.webNavigation.loadURI(aURI, aFlags, aReferrerURI, aPostData, null); + } finally { + if (this.userTypedClear) + this.userTypedClear--; + } ]]> @@ -209,7 +229,13 @@ diff --git a/xpfe/global/resources/content/bindings/browser.xml b/xpfe/global/resources/content/bindings/browser.xml index 4f3aae0ae07b..290ca3731268 100644 --- a/xpfe/global/resources/content/bindings/browser.xml +++ b/xpfe/global/resources/content/bindings/browser.xml @@ -64,8 +64,15 @@ @@ -74,8 +81,15 @@ @@ -141,7 +155,13 @@ catch (e) { } } - this.webNavigation.loadURI(aURI, aFlags, aReferrerURI, null, null); + try { + this.userTypedClear++; + this.webNavigation.loadURI(aURI, aFlags, aReferrerURI, null, null); + } finally { + if (this.userTypedClear) + this.userTypedClear--; + } ]]> @@ -183,7 +203,13 @@