зеркало из https://github.com/mozilla/pjs.git
Fix for bug # 82236. r=valeski sr=alecf a=blizzard(drivers@mozilla.org)
This commit is contained in:
Родитель
7aac7df260
Коммит
b2ba4afeb2
|
@ -232,6 +232,7 @@ nsBrowserStatusHandler.prototype =
|
||||||
onLocationChange : function(aWebProgress, aRequest, aLocation)
|
onLocationChange : function(aWebProgress, aRequest, aLocation)
|
||||||
{
|
{
|
||||||
var location = aLocation.spec;
|
var location = aLocation.spec;
|
||||||
|
domWindow = aWebProgress.DOMWindow;
|
||||||
|
|
||||||
if (this.hideAboutBlank) {
|
if (this.hideAboutBlank) {
|
||||||
this.hideAboutBlank = false;
|
this.hideAboutBlank = false;
|
||||||
|
@ -241,9 +242,12 @@ nsBrowserStatusHandler.prototype =
|
||||||
|
|
||||||
// We should probably not do this if the value has changed since the user
|
// We should probably not do this if the value has changed since the user
|
||||||
// searched
|
// searched
|
||||||
this.urlBar.value = location;
|
// Update urlbar only if a new page was loaded on the primary content area
|
||||||
SetPageProxyState("valid");
|
// Do not update urlbar if there was a subframe navigation
|
||||||
|
if (domWindow == domWindow.top) {
|
||||||
|
this.urlBar.value = location;
|
||||||
|
SetPageProxyState("valid");
|
||||||
|
}
|
||||||
UpdateBackForwardButtons();
|
UpdateBackForwardButtons();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче