corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 371cd4b623de (bug 901207) for m-bc orange

Browse Source
This commit is contained in:
Wes Kocher
2013-12-10 17:07:39 -08:00
parent 0eeca4a6a3
commit a0cc07a999
6 changed files with 11 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
browser/base/content/browser.js
View File

@@ -2929,37 +2929,13 @@ const BrowserSearch = {
return;
}
#endif
let openSearchPageIfFieldIsNotActive = function(aSearchBar) {
if (!aSearchBar || document.activeElement != aSearchBar.textbox.inputField)
openUILinkIn(Services.search.defaultEngine.searchForm, "current");
};
let searchBar = this.searchBar;
let placement = CustomizableUI.getPlacementOfWidget("search-container");
if (placement && placement.area == CustomizableUI.AREA_PANEL) {
PanelUI.show().then(() => {
// The panel is not constructed until the first time it is shown.
searchBar = this.searchBar;
searchBar.select();
openSearchPageIfFieldIsNotActive(searchBar);
});
return;
} else if (placement.area == CustomizableUI.AREA_NAVBAR && searchBar &&
searchBar.parentNode.classList.contains("overflowedItem")) {
let navBar = document.getElementById(CustomizableUI.AREA_NAVBAR);
navBar.overflowable.show().then(() => {
// The searchBar gets moved when the overflow panel opens.
searchBar = this.searchBar;
searchBar.select();
openSearchPageIfFieldIsNotActive(searchBar);
});
return;
}
if (searchBar && window.fullScreen) {
var searchBar = this.searchBar;
if (searchBar && window.fullScreen)
FullScreen.mouseoverToggle(true);
if (searchBar)
searchBar.select();
}
openSearchPageIfFieldIsNotActive(searchBar);
if (!searchBar || document.activeElement != searchBar.textbox.inputField)
openUILinkIn(Services.search.defaultEngine.searchForm, "current");
},
/**