Title: [193020] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193020
- Author
- [email protected]
- Date
- 2015-12-03 10:32:11 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r187280. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193019 => 193020)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:32:05 UTC (rev 193019)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:32:11 UTC (rev 193020)
@@ -1,5 +1,29 @@
2015-12-01 Timothy Hatcher <[email protected]>
+ Merge r187280. rdar://problem/23221163
+
+ 2015-07-23 Matt Baker <[email protected]>
+
+ Web Inspector: jittery cursor when adjusting time interval using timeline grabbers
+ https://bugs.webkit.org/show_bug.cgi?id=147095
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Views/TimelineRuler.css:
+ (.timeline-ruler.resizing-selection > .selection-drag):
+ Override selection-drag element's cursor when "resizing-selection" selector is applied.
+ (.timeline-ruler.allows-time-range-selection.creating-selection): Deleted.
+ Renamed "creating-selection" selector to "resizing-selection" to reflect its new role.
+
+ * UserInterface/Views/TimelineRuler.js:
+ (WebInspector.TimelineRuler.prototype._handleMouseMove):
+ (WebInspector.TimelineRuler.prototype._handleMouseUp):
+ (WebInspector.TimelineRuler.prototype._handleSelectionHandleMouseDown):
+ (WebInspector.TimelineRuler.prototype._handleSelectionHandleMouseUp):
+ Toggle cursor styles.
+
+2015-12-01 Timothy Hatcher <[email protected]>
+
Merge r187249. rdar://problem/23221163
2015-07-23 Devin Rousso <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css (193019 => 193020)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css 2015-12-03 18:32:05 UTC (rev 193019)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css 2015-12-03 18:32:11 UTC (rev 193020)
@@ -33,7 +33,8 @@
pointer-events: all;
}
-.timeline-ruler.allows-time-range-selection.creating-selection {
+.timeline-ruler.resizing-selection,
+.timeline-ruler.resizing-selection > .selection-drag {
cursor: col-resize;
}
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js (193019 => 193020)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-12-03 18:32:05 UTC (rev 193019)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-12-03 18:32:11 UTC (rev 193020)
@@ -61,7 +61,7 @@
WebInspector.TimelineRuler.MinimumDividerSpacing = 64;
WebInspector.TimelineRuler.AllowsTimeRangeSelectionStyleClassName = "allows-time-range-selection";
-WebInspector.TimelineRuler.CreatingSelectionStyleClassName = "creating-selection";
+WebInspector.TimelineRuler.ResizingSelectionStyleClassName = "resizing-selection";
WebInspector.TimelineRuler.DividerElementStyleClassName = "divider";
WebInspector.TimelineRuler.DividerLabelElementStyleClassName = "label";
@@ -722,7 +722,7 @@
this.selectionEndTime = Math.min(this.startTime + (Math.max(currentMousePosition, this._mouseDownPosition) * this.secondsPerPixel), this.endTime);
// Turn on col-resize cursor style once dragging begins, rather than on the initial mouse down.
- this._element.classList.add(WebInspector.TimelineRuler.CreatingSelectionStyleClassName);
+ this._element.classList.add(WebInspector.TimelineRuler.ResizingSelectionStyleClassName);
}
this._updateSelection(this._element.clientWidth, this.duration);
@@ -736,7 +736,7 @@
console.assert(event.button === 0);
if (!this._selectionIsMove) {
- this._element.classList.remove(WebInspector.TimelineRuler.CreatingSelectionStyleClassName);
+ this._element.classList.remove(WebInspector.TimelineRuler.ResizingSelectionStyleClassName);
if (this.selectionEndTime - this.selectionStartTime < this.minimumSelectionDuration) {
// The section is smaller than allowed, grow in the direction of the drag to meet the minumum.
@@ -785,6 +785,8 @@
document.addEventListener("mousemove", this._selectionHandleMouseMoveEventListener);
document.addEventListener("mouseup", this._selectionHandleMouseUpEventListener);
+ this._element.classList.add(WebInspector.TimelineRuler.ResizingSelectionStyleClassName);
+
event.preventDefault();
event.stopPropagation();
},
@@ -827,6 +829,8 @@
{
console.assert(event.button === 0);
+ this._element.classList.remove(WebInspector.TimelineRuler.ResizingSelectionStyleClassName);
+
document.removeEventListener("mousemove", this._selectionHandleMouseMoveEventListener);
document.removeEventListener("mouseup", this._selectionHandleMouseUpEventListener);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
