зеркало из https://github.com/mozilla/gecko-dev.git
Bug 898651 - Dont add the find-in-page menuitem when the StartUI is visible. r=mbrubeck
--HG-- extra : rebase_source : 627dd222e76bdbbe7fe882a636ae9a90c5a58c09
This commit is contained in:
Родитель
4b7937b86f
Коммит
dca66ae079
|
@ -100,15 +100,19 @@ var Appbar = {
|
|||
},
|
||||
|
||||
onMenuButton: function(aEvent) {
|
||||
var typesArray = ["find-in-page"];
|
||||
let typesArray = [];
|
||||
|
||||
if (ConsolePanelView.enabled) typesArray.push("open-error-console");
|
||||
if (!MetroUtils.immersive) typesArray.push("open-jsshell");
|
||||
if (!StartUI.isVisible)
|
||||
typesArray.push("find-in-page");
|
||||
if (ConsolePanelView.enabled)
|
||||
typesArray.push("open-error-console");
|
||||
if (!MetroUtils.immersive)
|
||||
typesArray.push("open-jsshell");
|
||||
|
||||
try {
|
||||
// If we have a valid http or https URI then show the view on desktop
|
||||
// menu item.
|
||||
var uri = Services.io.newURI(Browser.selectedBrowser.currentURI.spec,
|
||||
let uri = Services.io.newURI(Browser.selectedBrowser.currentURI.spec,
|
||||
null, null);
|
||||
if (uri.schemeIs('http') || uri.schemeIs('https')) {
|
||||
typesArray.push("view-on-desktop");
|
||||
|
|
Загрузка…
Ссылка в новой задаче