forked from mirrors/gecko-dev
cacf8fbbd8
This #ifdefs out the multiview for non-photon-theme, and checks for it being present in various bits of JS that interact with it. As a result, this will 'fix' the issues in this bug and in bug 1370967 for 55 as it moves off Nightly. By switching to the photonpanelmultiview, we get proper anchoring and slightly improved styling (bug 1354086 covers the rest of that), even where this code *is* enabled. bug 1370967 will still need fixing in the photonpanelmultiview / webextensions. MozReview-Commit-ID: 6x4HmyvxeRP --HG-- extra : rebase_source : 11503543ab1945f82dc2ba902c32dd6092ebbe80
74 lines
3 KiB
JavaScript
74 lines
3 KiB
JavaScript
"use strict";
|
|
|
|
const kOverflowPanel = document.getElementById("widget-overflow");
|
|
|
|
var gOriginalWidth;
|
|
registerCleanupFunction(async function() {
|
|
kOverflowPanel.removeAttribute("animate");
|
|
window.resizeTo(gOriginalWidth, window.outerHeight);
|
|
await waitForCondition(() => !document.getElementById("nav-bar").hasAttribute("overflowing"));
|
|
CustomizableUI.reset();
|
|
});
|
|
|
|
/**
|
|
* This checks that subview-compatible items show up as subviews rather than
|
|
* re-anchored panels. If we ever remove the developer widget, please
|
|
* replace this test with another subview - don't remove it.
|
|
*/
|
|
add_task(async function check_developer_subview_in_overflow() {
|
|
kOverflowPanel.setAttribute("animate", "false");
|
|
gOriginalWidth = window.outerWidth;
|
|
|
|
CustomizableUI.addWidgetToArea("developer-button", CustomizableUI.AREA_NAVBAR);
|
|
if (isNotReleaseOrBeta()) {
|
|
CustomizableUI.addWidgetToArea("webcompat-reporter-button", CustomizableUI.AREA_NAVBAR);
|
|
}
|
|
|
|
|
|
let navbar = document.getElementById(CustomizableUI.AREA_NAVBAR);
|
|
ok(!navbar.hasAttribute("overflowing"), "Should start with a non-overflowing toolbar.");
|
|
window.resizeTo(400, window.outerHeight);
|
|
|
|
await waitForCondition(() => navbar.hasAttribute("overflowing"));
|
|
|
|
let chevron = document.getElementById("nav-bar-overflow-button");
|
|
let shownPanelPromise = promisePanelElementShown(window, kOverflowPanel);
|
|
chevron.click();
|
|
await shownPanelPromise;
|
|
|
|
let developerView = document.getElementById("PanelUI-developer");
|
|
let button = document.getElementById("developer-button");
|
|
let subviewShownPromise = subviewShown(developerView);
|
|
button.click();
|
|
await subviewShownPromise;
|
|
let hasSubviews = !!kOverflowPanel.querySelector("photonpanelmultiview");
|
|
let expectedPanel = hasSubviews ? kOverflowPanel : document.getElementById("customizationui-widget-panel");
|
|
is(developerView.closest("panel"), expectedPanel, "Should be inside the panel");
|
|
expectedPanel.hidePopup();
|
|
await Promise.resolve(); // wait for popup to hide fully.
|
|
});
|
|
|
|
/**
|
|
* This checks that non-subview-compatible items still work correctly.
|
|
* Ideally we should make the downloads panel and bookmarks/library item
|
|
* proper subview items, then this test can go away, and potentially we can
|
|
* simplify some of the subview anchoring code.
|
|
*/
|
|
add_task(async function check_downloads_panel_in_overflow() {
|
|
let navbar = document.getElementById(CustomizableUI.AREA_NAVBAR);
|
|
ok(navbar.hasAttribute("overflowing"), "Should still be overflowing");
|
|
let chevron = document.getElementById("nav-bar-overflow-button");
|
|
let shownPanelPromise = promisePanelElementShown(window, kOverflowPanel);
|
|
chevron.click();
|
|
await shownPanelPromise;
|
|
|
|
let button = document.getElementById("downloads-button");
|
|
button.click();
|
|
await waitForCondition(() => {
|
|
let panel = document.getElementById("downloadsPanel");
|
|
return panel && panel.state != "closed";
|
|
});
|
|
let downloadsPanel = document.getElementById("downloadsPanel");
|
|
isnot(downloadsPanel.state, "closed", "Should be attempting to show the downloads panel.");
|
|
downloadsPanel.hidePopup();
|
|
});
|