Title: [193054] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193054
- Author
- [email protected]
- Date
- 2015-12-03 10:35:58 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r187887. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193053 => 193054)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:35:53 UTC (rev 193053)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:35:58 UTC (rev 193054)
@@ -1,5 +1,23 @@
2015-12-01 Timothy Hatcher <[email protected]>
+ Merge r187887. rdar://problem/23221163
+
+ 2015-08-04 Matt Baker <[email protected]>
+
+ Web Inspector: timeline overview should visually distinguish selection bounds outside the visible duration
+ https://bugs.webkit.org/show_bug.cgi?id=132764
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Views/TimelineRuler.css:
+ (.timeline-ruler > .selection-handle.clamped):
+ Added style for selection handle outside visible range.
+ * UserInterface/Views/TimelineRuler.js:
+ (WebInspector.TimelineRuler.prototype._updateSelection):
+ Toggle style class and add tool tip showing the handle's value when outside the visible range.
+
+2015-12-01 Timothy Hatcher <[email protected]>
+
Merge r187873. rdar://problem/23221163
2015-08-04 Brian J. Burg <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css (193053 => 193054)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css 2015-12-03 18:35:53 UTC (rev 193053)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css 2015-12-03 18:35:58 UTC (rev 193054)
@@ -164,6 +164,11 @@
z-index: 15;
}
+.timeline-ruler > .selection-handle.clamped {
+ border: 1px solid hsl(0, 0%, 64%);
+ background-color: white;
+}
+
.timeline-ruler > .selection-handle.left {
-webkit-transform: translateX(-4px);
}
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js (193053 => 193054)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-12-03 18:35:53 UTC (rev 193053)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2015-12-03 18:35:58 UTC (rev 193054)
@@ -592,11 +592,17 @@
this._updatePositionOfElement(this._leftSelectionHandleElement, newLeftPosition, visibleWidth, "left");
this._updatePositionOfElement(this._selectionDragElement, newLeftPosition, visibleWidth, "left");
+ this._leftSelectionHandleElement.classList.toggle("clamped", this._selectionStartTime < this._startTime);
+ this._leftSelectionHandleElement.title = this._selectionStartTime < this._startTime ? this._formatDividerLabelText(this._selectionStartTime) : "";
+
var newRightPosition = 1 - Math.min((this._selectionEndTime - this._startTime) / duration, 1);
this._updatePositionOfElement(this._rightShadedAreaElement, newRightPosition, visibleWidth, "width");
this._updatePositionOfElement(this._rightSelectionHandleElement, newRightPosition, visibleWidth, "right");
this._updatePositionOfElement(this._selectionDragElement, newRightPosition, visibleWidth, "right");
+ this._rightSelectionHandleElement.classList.toggle("clamped", this._selectionEndTime > this._endTime);
+ this._rightSelectionHandleElement.title = this._selectionEndTime > this._endTime ? this._formatDividerLabelText(this._selectionEndTime) : "";
+
if (!this._selectionDragElement.parentNode) {
this._element.appendChild(this._selectionDragElement);
this._element.appendChild(this._leftShadedAreaElement);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
