Skip to content
Snippets Groups Projects
Verified Commit 689345d4 authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

fixup! Bring back old Firefox onboarding

Bug 41600 - We remove the additions for "controlCenter", i.e. the site
identity panel, since the tor circuit display no longer lies within it,
so our tour no longer uses it.
parent bb584c63
Branches
Tags
1 merge request!609Bug 41687: Rebased alpha to 102.10
......@@ -821,14 +821,6 @@ var UITour = {
["ViewShowing", this.onAppMenuSubviewShowing],
],
},
{
name: "controlCenter",
node: aWindow.gIdentityHandler._identityPopup,
events: [
["popuphidden", this.onPanelHidden],
["popuphiding", this.onControlCenterHiding],
],
},
];
for (let panel of panels) {
// Ensure the menu panel is hidden and clean up panel listeners after calling hideMenu.
......@@ -1416,31 +1408,6 @@ var UITour = {
} else if (aMenuName == "bookmarks") {
let menuBtn = aWindow.document.getElementById("bookmarks-menu-button");
openMenuButton(menuBtn);
} else if (aMenuName == "controlCenter") {
let popup = aWindow.gIdentityHandler._identityPopup;
// Add the listener even if the panel is already open since it will still
// only get registered once even if it was UITour that opened it.
popup.addEventListener("popuphiding", this.onControlCenterHiding);
popup.addEventListener("popuphidden", this.onPanelHidden);
popup.setAttribute("noautohide", "true");
this.clearAvailableTargetsCache();
if (popup.state == "open") {
if (aOpenCallback) {
aOpenCallback();
}
return;
}
this.recreatePopup(popup);
// Open the control center
if (aOpenCallback) {
popup.addEventListener("popupshown", aOpenCallback, { once: true });
}
aWindow.document.getElementById("identity-box").click();
} else if (aMenuName == "pocket") {
let button = aWindow.document.getElementById("save-to-pocket-button");
if (!button) {
......@@ -1487,9 +1454,6 @@ var UITour = {
} else if (aMenuName == "bookmarks") {
let menuBtn = aWindow.document.getElementById("bookmarks-menu-button");
closeMenuButton(menuBtn);
} else if (aMenuName == "controlCenter") {
let panel = aWindow.gIdentityHandler._identityPopup;
panel.hidePopup();
} else if (aMenuName == "urlbar") {
aWindow.gURLBar.view.close();
}
......@@ -1568,12 +1532,6 @@ var UITour = {
UITour._hideAnnotationsForPanel(aEvent, false, UITour.targetIsInAppMenu);
},
onControlCenterHiding(aEvent) {
UITour._hideAnnotationsForPanel(aEvent, true, aTarget => {
return aTarget.targetName.startsWith("controlCenter-");
});
},
onPanelHidden(aEvent) {
aEvent.target.removeAttribute("noautohide");
UITour.recreatePopup(aEvent.target);
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment