Title: [179889] trunk/Source/WebInspectorUI
- Revision
- 179889
- Author
- [email protected]
- Date
- 2015-02-10 15:27:27 -0800 (Tue, 10 Feb 2015)
Log Message
Web Inspector: Make collapsed sidebars undraggable
https://bugs.webkit.org/show_bug.cgi?id=140664
Patch by Nikita Vasilyev <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (179888 => 179889)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-02-10 23:24:24 UTC (rev 179888)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-02-10 23:27:27 UTC (rev 179889)
@@ -1,3 +1,20 @@
+2015-02-10 Nikita Vasilyev <[email protected]>
+
+ 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 <[email protected]>
Web Inspector: CSS Pretty Printing: still fails fails to put space between rgb(...) and numbers in minified gradients
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.css (179888 => 179889)
--- trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.css 2015-02-10 23:24:24 UTC (rev 179888)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.css 2015-02-10 23:27:27 UTC (rev 179889)
@@ -79,14 +79,10 @@
right: -3px;
}
-.sidebar.collapsed.right > .resizer {
- left: -5px;
+.sidebar.collapsed {
+ display: none;
}
-.sidebar.collapsed.left > .resizer {
- right: -5px;
-}
-
.sidebar.left {
border-right: 1px solid rgb(179, 179, 179);
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js (179888 => 179889)
--- trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js 2015-02-10 23:24:24 UTC (rev 179888)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js 2015-02-10 23:27:27 UTC (rev 179889)
@@ -41,7 +41,6 @@
this._resizeElement = document.createElement("div");
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);
this._sidebarPanels = [];
@@ -258,14 +257,6 @@
this.selectedSidebarPanel = event.target.selectedNavigationItem ? event.target.selectedNavigationItem.identifier : null;
},
- _resizerDoubleClicked: function(event)
- {
- this.collapsed = !this.collapsed;
-
- event.preventDefault();
- event.stopPropagation();
- },
-
_resizerMouseDown: function(event)
{
if (event.button !== 0 || event.ctrlKey)
@@ -276,6 +267,9 @@
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.
document.addEventListener("mousemove", this._resizerMouseMovedEventListener, false);
document.addEventListener("mouseup", this._resizerMouseUpEventListener, false);
@@ -286,11 +280,12 @@
_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));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
