forked from mirrors/gecko-dev
882fa06e25
* Harden the new `hideAllViewsExcept()` to not do erroneous things if called when
the binding is already gone.
* Generalize things into `hideAllViewsExcept(thisOne)`:
- Clear `_viewShowing` in there and do the descriptionHeightWorkaround thing
in there too,
- For Photon panels, do all the 'current' attribute setting in there. To show
a panel during transition, I introduced the 'in-transition' attribute.
* I had to make sure not to over-eagerly dispatch 'ViewShowing' events, because
that confuses some,
* Move the temporary panel handling, which contains an ephemeral panelmultiview
instance, internally. This cleans up the hacky, duplicate PanelUI.js code nicely.
* Keep a local copy of `_transitionDetails` to ensure it's still there after transition,
* Harden `_cleanupTransitionPhase()` to only clear the phase that belongs to a
specific transition, _if_ that's passed in as an argument. This resolves any
potential raciness that might occur when `showSubView()` is called again mid-transition.
* Skip the UITour element visibility check when it's inside a panelview, because
too many things need to happen and that check is too simple to be useful in
that case.
MozReview-Commit-ID: 5HpJKs1Ny5j
--HG--
extra : rebase_source : b810e1de2dbd75932a42d68e751fdaecd9fee69a
69 lines
2.4 KiB
JavaScript
69 lines
2.4 KiB
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
"use strict";
|
|
|
|
var tempElements = [];
|
|
|
|
function insertTempItemsIntoMenu(parentMenu) {
|
|
// Last element is null to insert at the end:
|
|
let beforeEls = [parentMenu.firstChild, parentMenu.lastChild, null];
|
|
for (let i = 0; i < beforeEls.length; i++) {
|
|
let sep = document.createElement("menuseparator");
|
|
tempElements.push(sep);
|
|
parentMenu.insertBefore(sep, beforeEls[i]);
|
|
let menu = document.createElement("menu");
|
|
tempElements.push(menu);
|
|
parentMenu.insertBefore(menu, beforeEls[i]);
|
|
// And another separator for good measure:
|
|
sep = document.createElement("menuseparator");
|
|
tempElements.push(sep);
|
|
parentMenu.insertBefore(sep, beforeEls[i]);
|
|
}
|
|
}
|
|
|
|
function checkSeparatorInsertion(menuId, buttonId, subviewId) {
|
|
return async function() {
|
|
info("Checking for duplicate separators in " + buttonId + " widget");
|
|
let menu = document.getElementById(menuId);
|
|
insertTempItemsIntoMenu(menu);
|
|
|
|
CustomizableUI.addWidgetToArea(buttonId, CustomizableUI.AREA_FIXED_OVERFLOW_PANEL);
|
|
|
|
await waitForOverflowButtonShown();
|
|
|
|
await document.getElementById("nav-bar").overflowable.show();
|
|
|
|
let subview = document.getElementById(subviewId);
|
|
let button = document.getElementById(buttonId);
|
|
button.click();
|
|
await BrowserTestUtils.waitForEvent(subview, "ViewShown");
|
|
|
|
let subviewBody = subview.firstChild;
|
|
ok(subviewBody.firstChild, "Subview should have a kid");
|
|
is(subviewBody.firstChild.localName, "toolbarbutton", "There should be no separators to start with");
|
|
|
|
for (let kid of subviewBody.children) {
|
|
if (kid.localName == "menuseparator") {
|
|
ok(kid.previousSibling && kid.previousSibling.localName != "menuseparator",
|
|
"Separators should never have another separator next to them, and should never be the first node.");
|
|
}
|
|
}
|
|
|
|
let panelHiddenPromise = promiseOverflowHidden(window);
|
|
PanelUI.overflowPanel.hidePopup();
|
|
await panelHiddenPromise;
|
|
|
|
CustomizableUI.reset();
|
|
};
|
|
}
|
|
|
|
add_task(checkSeparatorInsertion("menuWebDeveloperPopup", "developer-button", "PanelUI-developer"));
|
|
|
|
registerCleanupFunction(function() {
|
|
for (let el of tempElements) {
|
|
el.remove();
|
|
}
|
|
tempElements = null;
|
|
});
|