Fewer about:blank URLs should be hidden b=370555 r=CTho

git-svn-id: svn://10.0.0.236/trunk@225233 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
neil%parkwaycc.co.uk
2007-04-29 21:35:16 +00:00
parent 40e8a54fed
commit 4438494c4f
3 changed files with 6 additions and 4 deletions

View File

@@ -1555,7 +1555,7 @@ function BrowserLoadURL(aTriggeringEvent)
null, null, nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP);
// Reset url in the urlbar, copied from handleURLBarRevert()
var oldURL = browser.currentURI.spec;
if (oldURL != "about:blank") {
if (oldURL != "about:blank" || content.opener) {
gURLBar.value = oldURL;
SetPageProxyState("valid", null);
} else
@@ -2208,7 +2208,7 @@ function handleURLBarRevert()
// don't revert to last valid url unless page is NOT loading
// and user is NOT key-scrolling through autocomplete list
if (!throbberElement.hasAttribute("busy") && !isScrolling) {
if (url != "about:blank") {
if (url != "about:blank" || content.opener) {
gURLBar.value = url;
gURLBar.select();
SetPageProxyState("valid", null); // XXX Build a URI and pass it in here.

View File

@@ -316,7 +316,7 @@ nsBrowserStatusHandler.prototype =
}
}
if (!getWebNavigation().canGoBack && location == "about:blank")
if (!getWebNavigation().canGoBack && location == "about:blank" && !content.opener)
location = "";
// Disable menu entries for images, enable otherwise

View File

@@ -657,7 +657,9 @@
if (docElement.getAttribute("chromehidden").indexOf("location") != -1) {
var uri = this.mURIFixup.createExposableURI(
this.mCurrentBrowser.currentURI);
if (uri.host)
if (uri.schemeIs("about"))
newTitle = uri.spec + sep + newTitle;
else if (uri.host)
newTitle = uri.prePath + sep + newTitle;
}
} catch (e) {}