From 753f4e8f9ae7eb825da478bc20a6a57ff939bf06 Mon Sep 17 00:00:00 2001 From: "cbiesinger%web.de" Date: Wed, 22 Aug 2007 04:59:36 +0000 Subject: [PATCH] Bug 261790 port various changes betwen xpfe/toolkit r=mconnor sr=neil --- browser/base/content/tabbrowser.xml | 34 +++++++++++++++-------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 590f926f87d..f59fc77d45b 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -192,7 +192,7 @@ const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener; const nsIChannel = Components.interfaces.nsIChannel; - if (aStateFlags & nsIWebProgressListener.STATE_START && + if (aStateFlags & nsIWebProgressListener.STATE_START && aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK) { // It's okay to clear what the user typed when we start // loading a document. If the user types, this flag gets @@ -205,7 +205,7 @@ if (!this.mBlank) { this.mTab.setAttribute("busy", "true"); this.mTab.label = this.mTabBrowser.mStringBundle.getString("tabs.loading"); - this.mTab.removeAttribute("image"); + this.mTab.removeAttribute("image"); this.mIcon = ""; if (this.mTabBrowser.mCurrentTab == this.mTab) @@ -227,7 +227,7 @@ var location = aRequest.QueryInterface(nsIChannel).URI; if (this.mIcon) { this.mTab.setAttribute("image", this.mIcon); - mIcon = ""; + this.mIcon = ""; } else if (this.mTabBrowser.shouldLoadFavIcon(location)) this.mTabBrowser.loadFavIcon(location, "image", this.mTab); @@ -246,10 +246,10 @@ p.onStateChange(aWebProgress, aRequest, aStateFlags, aStatus); } } - } - , + }, - onLocationChange : function(aWebProgress, aRequest, aLocation) { + onLocationChange : function(aWebProgress, aRequest, aLocation) + { // The document loaded correctly, clear the value if we should if (this.mBrowser.userTypedClear) this.mBrowser.userTypedValue = null; @@ -263,7 +263,8 @@ } }, - onStatusChange : function(aWebProgress, aRequest, aStatus, aMessage) { + onStatusChange : function(aWebProgress, aRequest, aStatus, aMessage) + { if (this.mBlank) return; @@ -295,8 +296,7 @@ return this; throw Components.results.NS_NOINTERFACE; } - - }); + }); ]]> @@ -316,7 +316,7 @@ @@ -484,7 +484,7 @@ // Update the window title. this.updateTitlebar(); - + // If the new tab is busy, and our current state is not busy, then // we need to fire a start to all progress listeners. const nsIWebProgressListener = Components.interfaces.nsIWebProgressListener; @@ -769,7 +769,9 @@ } // Wire up a progress listener to our filter. - const listener = this.mTabProgressListener(this.mCurrentTab, this.mCurrentBrowser, false); + const listener = this.mTabProgressListener(this.mCurrentTab, + this.mCurrentBrowser, + false); filter.addProgressListener(listener, Components.interfaces.nsIWebProgress.NOTIFY_ALL); this.mTabListeners[0] = listener; ]]> @@ -783,16 +785,14 @@