Bug 1360282 - Remove _setVisibility helper now that the sidebar is always shown through show();r=Gijs draft
authorBrian Grinstead <bgrinstead@mozilla.com>
Tue, 13 Jun 2017 08:14:57 -0700
changeset 593455 ed67bebb88ca18ba009d3b943d52086e648161f4
parent 593454 6a76148a3adaef616df2107f62d2a1138dd86aa0
child 593456 bc2b45ea29848aee3767757a8a0497eaf065cd0d
push id63696
push userbgrinstead@mozilla.com
push dateTue, 13 Jun 2017 15:15:10 +0000
reviewersGijs
bugs1360282
milestone56.0a1
Bug 1360282 - Remove _setVisibility helper now that the sidebar is always shown through show();r=Gijs MozReview-Commit-ID: FWJshLtYZ3h
browser/base/content/browser-sidebar.js
--- a/browser/base/content/browser-sidebar.js
+++ b/browser/base/content/browser-sidebar.js
@@ -253,29 +253,16 @@ var SidebarUI = {
     return this._title.value;
   },
 
   set title(value) {
     this._title.value = value;
   },
 
   /**
-   * Internal helper to show/hide the box and splitter elements.
-   *
-   * @param {bool} visible
-   */
-  _setVisibility(visible) {
-    this._box.hidden = !visible;
-    this._splitter.hidden = !visible;
-    if (visible) {
-      this.setPosition();
-    }
-  },
-
-  /**
    * Toggle the visibility of the sidebar. If the sidebar is hidden or is open
    * with a different commandID, then the sidebar will be opened using the
    * specified commandID. Otherwise the sidebar will be hidden.
    *
    * @param {string} commandID ID of the xul:broadcaster element to use.
    * @return {Promise}
    */
   toggle(commandID = this.currentID) {
@@ -322,17 +309,18 @@ var SidebarUI = {
       for (let broadcaster of broadcasters) {
         if (broadcaster != sidebarBroadcaster) {
           broadcaster.removeAttribute("checked");
         } else {
           sidebarBroadcaster.setAttribute("checked", "true");
         }
       }
 
-      this._setVisibility(true);
+      this._box.hidden = this._splitter.hidden = false;
+      this.setPosition();
 
       this.hideSwitcherPanel();
 
       this._box.setAttribute("sidebarcommand", sidebarBroadcaster.id);
       this.lastOpenedId = sidebarBroadcaster.id;
 
       let title = sidebarBroadcaster.getAttribute("sidebartitle") ||
                   sidebarBroadcaster.getAttribute("label");
@@ -396,17 +384,17 @@ var SidebarUI = {
     // until about:blank has loaded (which does not happen as long as the
     // element is hidden).
     this.browser.setAttribute("src", "about:blank");
     this.browser.docShell.createAboutBlankContentViewer(null);
 
     sidebarBroadcaster.removeAttribute("checked");
     this._box.setAttribute("sidebarcommand", "");
     this._title.value = "";
-    this._setVisibility(false);
+    this._box.hidden = this._splitter.hidden = true;
 
     let selBrowser = gBrowser.selectedBrowser;
     selBrowser.focus();
     selBrowser.messageManager.sendAsyncMessage("Sidebar:VisibilityChange",
       {commandID, isOpen: false}
     );
     BrowserUITelemetry.countSidebarEvent(commandID, "hide");
   },