Backed out changeset 081628fb2043 (bug 1287368) for dt tests failures
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 20 Jul 2016 10:08:28 +0200
changeset 389876 e7cd99539c53235604f03a6cd56458dd2d337cdb
parent 389875 82d5ffb13e63041c0f1e074e5227e489d4036948
child 389877 0687d5c6b97b23c247016b4214a431e38d751152
child 389924 6850035575f72f307da52235b503e6930212dddf
push id23554
push userpbrosset@mozilla.com
push dateWed, 20 Jul 2016 09:13:33 +0000
bugs1287368
milestone50.0a1
backs out081628fb204320bda9f26d72f54c06ce64bdc26f
Backed out changeset 081628fb2043 (bug 1287368) for dt tests failures
devtools/client/inspector/inspector-panel.js
--- a/devtools/client/inspector/inspector-panel.js
+++ b/devtools/client/inspector/inspector-panel.js
@@ -446,63 +446,53 @@ InspectorPanel.prototype = {
         strings.GetStringFromName("inspector.sidebar.fontInspectorTitle"),
         defaultTab == "fontinspector");
 
       this.fontInspector = new FontInspector(this, this.panelWin);
       this.sidebar.toggleTab(true, "fontinspector");
     }
 
     this.setupSidebarToggle();
-    this.setupSidebarSize();
+    this.setupSidebarWidth();
 
     this.sidebar.show(defaultTab);
   },
 
   /**
-   * Sidebar size is currently driven by vbox.inspector-sidebar-container
-   * element, which is located at the left/bottom side of the side bar splitter.
-   * Its size is changed by the splitter and stored into preferences.
+   * Sidebar width is currently driven by vbox.inspector-sidebar-container
+   * element, which is located at the left side of the side bar splitter.
+   * It's width is changed by the splitter and stored into preferences.
    * As soon as bug 1260552 is fixed and new HTML based splitter in place
-   * the size can be driven by div.inspector-sidebar element. This element
-   * represents the ToolSidebar and so, the entire logic related to size
+   * the width can be driven by div.inspector-sidebar element. This element
+   * represents the ToolSidebar and so, the entire logic related to width
    * persistence can be done inside the ToolSidebar.
    */
-  setupSidebarSize: function () {
+  setupSidebarWidth: function () {
     let sidePaneContainer = this.panelDoc.querySelector(
       "#inspector-sidebar-container");
 
     this.sidebar.on("show", () => {
       try {
         sidePaneContainer.width = Services.prefs.getIntPref(
           "devtools.toolsidebar-width.inspector");
-        sidePaneContainer.height = Services.prefs.getIntPref(
-          "devtools.toolsidebar-height.inspector");
       } catch (e) {
         // The default width is the min-width set in CSS
         // for #inspector-sidebar-container
-        // Set width and height of the sidebar container. Only one
-        // value is really useful at a time depending on the current
-        // toolbox orientation and having both doesn't break anything.
         sidePaneContainer.width = 450;
-        sidePaneContainer.height = 450;
       }
     });
 
     this.sidebar.on("hide", () => {
       Services.prefs.setIntPref("devtools.toolsidebar-width.inspector",
         sidePaneContainer.width);
-      Services.prefs.setIntPref("devtools.toolsidebar-height.inspector",
-        sidePaneContainer.height);
     });
 
     this.sidebar.on("destroy", () => {
       Services.prefs.setIntPref("devtools.toolsidebar-width.inspector",
-        sidePaneContainer.height);
-      Services.prefs.setIntPref("devtools.toolsidebar-height.inspector",
-        sidePaneContainer.height);
+        sidePaneContainer.width);
     });
   },
 
   /**
    * Add the expand/collapse behavior for the sidebar panel.
    */
   setupSidebarToggle: function () {
     let SidebarToggle = this.React.createFactory(this.browserRequire(