Changeset 179889 in webkit

Timestamp:

Feb 10, 2015 3:27:27 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Make collapsed sidebars undraggable
​https://bugs.webkit.org/show_bug.cgi?id=140664

Patch by Nikita Vasilyev <Nikita Vasilyev> on 2015-02-10
Reviewed by Timothy Hatcher.

• UserInterface/Views/Sidebar.css:

(.sidebar.collapsed):
(.sidebar.collapsed.right > .resizer): Deleted.
(.sidebar.collapsed.left > .resizer): Deleted.

• UserInterface/Views/Sidebar.js:

(WebInspector.Sidebar):
(WebInspector.Sidebar.prototype._resizerMouseDown):
(WebInspector.Sidebar.prototype._resizerMouseMoved):
(WebInspector.Sidebar.prototype._resizerDoubleClicked): Deleted.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/Sidebar.css (modified) (1 diff)
• UserInterface/Views/Sidebar.js (modified) (4 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-02-10  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        Web Inspector: Make collapsed sidebars undraggable
+        https://bugs.webkit.org/show_bug.cgi?id=140664
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/Sidebar.css:
+        (.sidebar.collapsed):
+        (.sidebar.collapsed.right > .resizer): Deleted.
+        (.sidebar.collapsed.left > .resizer): Deleted.
+        * UserInterface/Views/Sidebar.js:
+        (WebInspector.Sidebar):
+        (WebInspector.Sidebar.prototype._resizerMouseDown):
+        (WebInspector.Sidebar.prototype._resizerMouseMoved):
+        (WebInspector.Sidebar.prototype._resizerDoubleClicked): Deleted.
+
 2015-02-10  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.css

@@ -80 +80 @@
 }
 
-.sidebar.collapsed.right > .resizer {
-    left: -5px;
-}
-
-.sidebar.collapsed.left > .resizer {
-    right: -5px;
+.sidebar.collapsed {
+    display: none;
 }
 

trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js

@@ -42 +42 @@
     this._resizeElement.classList.add(WebInspector.Sidebar.ResizeElementStyleClassName);
     this._resizeElement.addEventListener("mousedown", this._resizerMouseDown.bind(this), false);
-    this._resizeElement.addEventListener("dblclick", this._resizerDoubleClicked.bind(this), false);
     this._element.insertBefore(this._resizeElement, this._element.firstChild);
 
@@ -259 +258 @@
     },
 
-    _resizerDoubleClicked: function(event)
-    {
-        this.collapsed = !this.collapsed;
-
-        event.preventDefault();
-        event.stopPropagation();
-    },
-
     _resizerMouseDown: function(event)
     {
@@ -276 +267 @@
         this._resizerMouseMovedEventListener = this._resizerMouseMoved.bind(this);
         this._resizerMouseUpEventListener = this._resizerMouseUp.bind(this);
+
+        this._widthBeforeResize = this.width;
+        this._resizerMouseDownX = event.pageX;
 
         // Register these listeners on the document so we can track the mouse if it leaves the resizer.
@@ -287 +281 @@
     _resizerMouseMoved: function(event)
     {
+        var deltaX = this._resizerMouseDownX - event.pageX;
+
         if (this._side === WebInspector.Sidebar.Sides.Left)
-            var newWidth = event.pageX - this._element.totalOffsetLeft;
-        else
-            var newWidth = this._element.totalOffsetLeft + this._element.offsetWidth - event.pageX;
-
+            deltaX *= -1;
+
+        var newWidth = deltaX + this._widthBeforeResize;
         this.width = newWidth;
         this.collapsed = (newWidth < (this.minimumWidth / 2));