зеркало из https://github.com/mozilla/pjs.git
Bug 531071: bypass the awesomescreen when the browser is being opened for specific page [r=gavin]
This commit is contained in:
Родитель
4e7f2dfc55
Коммит
93e1225172
|
@ -499,8 +499,8 @@ var BrowserUI = {
|
|||
|
||||
// Give the new page lots of room
|
||||
Browser.hideSidebars();
|
||||
this.closeAutoComplete(true);
|
||||
|
||||
this._edit.popup.close();
|
||||
this._edit.value = aURI;
|
||||
|
||||
var flags = Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
|
||||
|
@ -516,6 +516,13 @@ var BrowserUI = {
|
|||
this._edit.showHistoryPopup();
|
||||
},
|
||||
|
||||
closeAutoComplete: function closeAutoComplete(aResetInput) {
|
||||
if (aResetInput)
|
||||
this._edit.popup.close();
|
||||
else
|
||||
this._edit.popup.closePopup();
|
||||
},
|
||||
|
||||
isAutoCompleteOpen: function isAutoCompleteOpen() {
|
||||
return this._edit.popup.popupOpen;
|
||||
},
|
||||
|
@ -529,8 +536,7 @@ var BrowserUI = {
|
|||
|
||||
// Give the new page lots of room
|
||||
Browser.hideSidebars();
|
||||
|
||||
this._edit.popup.closePopup();
|
||||
this.closeAutoComplete(false);
|
||||
|
||||
// Make sure we're online before attempting to load
|
||||
Util.forceOnline();
|
||||
|
@ -553,12 +559,14 @@ var BrowserUI = {
|
|||
this.hidePanel();
|
||||
|
||||
if (aURI == "about:blank") {
|
||||
// Display awesomebar UI
|
||||
this.showToolbar(true);
|
||||
this.showAutoComplete();
|
||||
}
|
||||
else {
|
||||
// Give the new page lots of room
|
||||
Browser.hideSidebars();
|
||||
this.closeAutoComplete(true);
|
||||
}
|
||||
|
||||
return tab;
|
||||
|
|
Загрузка…
Ссылка в новой задаче