Commit 5b4f215b authored by henry's avatar henry
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 fdaa4267

browser/components/uitour/UITour.jsm

+0 −42
Changes for browser/components/uitour/UITour.jsm: 0 added lines, 42 removed lines.
Original line number Diff line number Diff line
@@ -877,14 +877,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.
@@ -1476,31 +1468,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-icon-box").click();

    } else if (aMenuName == "pocket") {

      let button = aWindow.document.getElementById("save-to-pocket-button");

      if (!button) {
@@ -1551,9 +1518,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();

    }
@@ -1632,12 +1596,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);