зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset cc55d4e3d13d (bug 1410352) for eslint failure at browser/components/customizableui/CustomizableUI.jsm:4339: 'aEvent' is already declared in the upper scope. r=backout
--HG-- extra : rebase_source : 29fad97f166d57cc9b192874f0ec82ea8b6c044c
This commit is contained in:
Родитель
3f918ff3a0
Коммит
fabade716b
|
@ -105,17 +105,3 @@ add_task(async function test_customizationui_panel_touch() {
|
||||||
|
|
||||||
CustomizableUI.reset();
|
CustomizableUI.reset();
|
||||||
});
|
});
|
||||||
|
|
||||||
// Test the overflow menu panel.
|
|
||||||
add_task(async function test_overflow_panel_touch() {
|
|
||||||
// Move something in the overflow menu to make the button appear.
|
|
||||||
CustomizableUI.addWidgetToArea("library-button", CustomizableUI.AREA_FIXED_OVERFLOW_PANEL);
|
|
||||||
await BrowserTestUtils.waitForCondition(() =>
|
|
||||||
CustomizableUI.getPlacementOfWidget("library-button").area == CustomizableUI.AREA_FIXED_OVERFLOW_PANEL);
|
|
||||||
|
|
||||||
let overflowPanel = document.getElementById("widget-overflow");
|
|
||||||
let target = document.getElementById("nav-bar-overflow-button");
|
|
||||||
await openAndCheckMenu(overflowPanel, target);
|
|
||||||
|
|
||||||
CustomizableUI.reset();
|
|
||||||
});
|
|
||||||
|
|
|
@ -4312,7 +4312,7 @@ OverflowableToolbar.prototype = {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
show(aEvent) {
|
show() {
|
||||||
if (this._panel.state == "open") {
|
if (this._panel.state == "open") {
|
||||||
return Promise.resolve();
|
return Promise.resolve();
|
||||||
}
|
}
|
||||||
|
@ -4333,7 +4333,7 @@ OverflowableToolbar.prototype = {
|
||||||
// Ensure we update the gEditUIVisible flag when opening the popup, in
|
// Ensure we update the gEditUIVisible flag when opening the popup, in
|
||||||
// case the edit controls are in it.
|
// case the edit controls are in it.
|
||||||
this._panel.addEventListener("popupshowing", () => doc.defaultView.updateEditUIVisibility(), {once: true});
|
this._panel.addEventListener("popupshowing", () => doc.defaultView.updateEditUIVisibility(), {once: true});
|
||||||
this._panel.openPopup(anchor || this._chevron, { triggerEvent: aEvent });
|
this._panel.openPopup(anchor || this._chevron);
|
||||||
this._chevron.open = true;
|
this._chevron.open = true;
|
||||||
|
|
||||||
this._panel.addEventListener("popupshown", aEvent => {
|
this._panel.addEventListener("popupshown", aEvent => {
|
||||||
|
@ -4349,7 +4349,7 @@ OverflowableToolbar.prototype = {
|
||||||
this._panel.hidePopup();
|
this._panel.hidePopup();
|
||||||
this._chevron.open = false;
|
this._chevron.open = false;
|
||||||
} else if (this._panel.state != "hiding" && !this._chevron.disabled) {
|
} else if (this._panel.state != "hiding" && !this._chevron.disabled) {
|
||||||
this.show(aEvent);
|
this.show();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -1118,7 +1118,6 @@ notification[value="translation"] {
|
||||||
%include ../shared/contextmenu.inc.css
|
%include ../shared/contextmenu.inc.css
|
||||||
|
|
||||||
/* Make menu items larger when opened through touch. */
|
/* Make menu items larger when opened through touch. */
|
||||||
#widget-overflow[touchmode] .toolbarbutton-1,
|
|
||||||
panel[touchmode] .PanelUI-subView .subviewbutton,
|
panel[touchmode] .PanelUI-subView .subviewbutton,
|
||||||
menupopup[touchmode] menu,
|
menupopup[touchmode] menu,
|
||||||
menupopup[touchmode] menuitem {
|
menupopup[touchmode] menuitem {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче