<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[197034] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/197034">197034</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-02-24 09:41:42 -0800 (Wed, 24 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: TimelineRuler should have a "select all" mode
https://bugs.webkit.org/show_bug.cgi?id=154561
<rdar://problem/24779872>
Reviewed by Timothy Hatcher.
TimelineRuler is initialized with a selected range of [0, Number.MAX_VALUE),
indicating the entire timeline is selected. This patch makes it possible to
return the ruler to this state, after being overwritten by a custom selection.
When no custom selection exists, the selection handles are hidden.
* UserInterface/Views/TimelineRuler.css:
(.timeline-ruler.selection-hidden > :matches(.selection-drag, .selection-handle, .shaded-area)):
Style for hiding selection controls as needed.
* UserInterface/Views/TimelineRuler.js:
(WebInspector.TimelineRuler):
Represent unbounded selection interval as [0, Number.MAX_VALUE).
(WebInspector.TimelineRuler.prototype.set allowsTimeRangeSelection):
Register double-click event listener.
(WebInspector.TimelineRuler.prototype.set zeroTime):
(WebInspector.TimelineRuler.prototype.get entireRangeSelected):
(WebInspector.TimelineRuler.prototype.selectEntireRange):
Let clients check and set the selection of the entire range without needing
to use the internal sentinel values 0 and Number.MAX_VALUE.
(WebInspector.TimelineRuler.prototype._updateSelection):
Update ruler styles and dispatch selection change event when entire
range is selected.
(WebInspector.TimelineRuler.prototype._handleDoubleClick):
If a user-defined selection exists, select the entire range.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulercss">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (197033 => 197034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-02-24 17:36:12 UTC (rev 197033)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-02-24 17:41:42 UTC (rev 197034)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-02-24 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: TimelineRuler should have a "select all" mode
+ https://bugs.webkit.org/show_bug.cgi?id=154561
+ <rdar://problem/24779872>
+
+ Reviewed by Timothy Hatcher.
+
+ TimelineRuler is initialized with a selected range of [0, Number.MAX_VALUE),
+ indicating the entire timeline is selected. This patch makes it possible to
+ return the ruler to this state, after being overwritten by a custom selection.
+ When no custom selection exists, the selection handles are hidden.
+
+ * UserInterface/Views/TimelineRuler.css:
+ (.timeline-ruler.selection-hidden > :matches(.selection-drag, .selection-handle, .shaded-area)):
+ Style for hiding selection controls as needed.
+
+ * UserInterface/Views/TimelineRuler.js:
+ (WebInspector.TimelineRuler):
+ Represent unbounded selection interval as [0, Number.MAX_VALUE).
+
+ (WebInspector.TimelineRuler.prototype.set allowsTimeRangeSelection):
+ Register double-click event listener.
+
+ (WebInspector.TimelineRuler.prototype.set zeroTime):
+ (WebInspector.TimelineRuler.prototype.get entireRangeSelected):
+ (WebInspector.TimelineRuler.prototype.selectEntireRange):
+ Let clients check and set the selection of the entire range without needing
+ to use the internal sentinel values 0 and Number.MAX_VALUE.
+
+ (WebInspector.TimelineRuler.prototype._updateSelection):
+ Update ruler styles and dispatch selection change event when entire
+ range is selected.
+
+ (WebInspector.TimelineRuler.prototype._handleDoubleClick):
+ If a user-defined selection exists, select the entire range.
+
</ins><span class="cx"> 2016-02-24 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Dim selected items when docked Inspector window is inactive
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulercss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css (197033 => 197034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css 2016-02-24 17:36:12 UTC (rev 197033)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css 2016-02-24 17:41:42 UTC (rev 197034)
</span><span class="lines">@@ -178,6 +178,10 @@
</span><span class="cx"> z-index: 15;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.timeline-ruler.selection-hidden > :matches(.selection-drag, .selection-handle, .shaded-area) {
+ display: none;
+}
+
</ins><span class="cx"> .timeline-ruler > .selection-handle.clamped {
</span><span class="cx"> border-color: hsl(0, 0%, 64%);
</span><span class="cx"> background-color: white;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js (197033 => 197034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2016-02-24 17:36:12 UTC (rev 197033)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2016-02-24 17:41:42 UTC (rev 197034)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> this._duration = NaN;
</span><span class="cx"> this._secondsPerPixel = 0;
</span><span class="cx"> this._selectionStartTime = 0;
</span><del>- this._selectionEndTime = Infinity;
</del><ins>+ this._selectionEndTime = Number.MAX_VALUE;
</ins><span class="cx"> this._endTimePinned = false;
</span><span class="cx"> this._snapInterval = 0;
</span><span class="cx"> this._allowsClippedLabels = false;
</span><span class="lines">@@ -105,7 +105,9 @@
</span><span class="cx"> this._allowsTimeRangeSelection = x;
</span><span class="cx">
</span><span class="cx"> if (x) {
</span><ins>+ this._doubleClickEventListener = this._handleDoubleClick.bind(this);
</ins><span class="cx"> this._mouseDownEventListener = this._handleMouseDown.bind(this);
</span><ins>+ this.element.addEventListener("dblclick", this._doubleClickEventListener);
</ins><span class="cx"> this.element.addEventListener("mousedown", this._mouseDownEventListener);
</span><span class="cx">
</span><span class="cx"> this._leftShadedAreaElement = document.createElement("div");
</span><span class="lines">@@ -131,8 +133,10 @@
</span><span class="cx">
</span><span class="cx"> this._needsSelectionLayout();
</span><span class="cx"> } else {
</span><ins>+ this.element.removeEventListener("dblclick", this._doubleClickEventListener);
</ins><span class="cx"> this.element.removeEventListener("mousedown", this._mouseDownEventListener);
</span><del>- delete this._mouseDownEventListener;
</del><ins>+ this._doubleClickEventListener = null;
+ this._mouseDownEventListener = null;
</ins><span class="cx">
</span><span class="cx"> this._leftShadedAreaElement.remove();
</span><span class="cx"> this._rightShadedAreaElement.remove();
</span><span class="lines">@@ -171,6 +175,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._zeroTime = x;
</span><ins>+ if (this.entireRangeSelected)
+ this.selectionStartTime = this._zeroTime;
</ins><span class="cx">
</span><span class="cx"> this.needsLayout();
</span><span class="cx"> }
</span><span class="lines">@@ -292,6 +298,17 @@
</span><span class="cx"> this._needsSelectionLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get entireRangeSelected()
+ {
+ return this._selectionStartTime === this._zeroTime && this._selectionEndTime === Number.MAX_VALUE;
+ }
+
+ selectEntireRange()
+ {
+ this.selectionStartTime = this._zeroTime;
+ this.selectionEndTime = Number.MAX_VALUE;
+ }
+
</ins><span class="cx"> addMarker(marker)
</span><span class="cx"> {
</span><span class="cx"> console.assert(marker instanceof WebInspector.TimelineMarker);
</span><span class="lines">@@ -596,11 +613,18 @@
</span><span class="cx"> this._scheduledSelectionLayoutUpdateIdentifier = undefined;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- this.element.classList.toggle(WebInspector.TimelineRuler.AllowsTimeRangeSelectionStyleClassName, this._allowsTimeRangeSelection);
</del><ins>+ this.element.classList.toggle("allows-time-range-selection", this._allowsTimeRangeSelection);
</ins><span class="cx">
</span><span class="cx"> if (!this._allowsTimeRangeSelection)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ this.element.classList.toggle("selection-hidden", this.entireRangeSelected);
+
+ if (this.entireRangeSelected) {
+ this._dispatchTimeRangeSelectionChangedEvent();
+ return;
+ }
+
</ins><span class="cx"> let startTimeClamped = this._selectionStartTime < this._startTime || this._selectionStartTime > this._endTime;
</span><span class="cx"> let endTimeClamped = this._selectionEndTime < this._startTime || this._selectionEndTime > this._endTime;
</span><span class="cx">
</span><span class="lines">@@ -669,6 +693,14 @@
</span><span class="cx"> this._needsMarkerLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _handleDoubleClick(event)
+ {
+ if (this.entireRangeSelected)
+ return;
+
+ this.selectEntireRange();
+ }
+
</ins><span class="cx"> _handleMouseDown(event)
</span><span class="cx"> {
</span><span class="cx"> // Only handle left mouse clicks.
</span><span class="lines">@@ -857,7 +889,6 @@
</span><span class="cx"> WebInspector.TimelineRuler.MinimumLeftDividerSpacing = 48;
</span><span class="cx"> WebInspector.TimelineRuler.MinimumDividerSpacing = 64;
</span><span class="cx">
</span><del>-WebInspector.TimelineRuler.AllowsTimeRangeSelectionStyleClassName = "allows-time-range-selection";
</del><span class="cx"> WebInspector.TimelineRuler.ResizingSelectionStyleClassName = "resizing-selection";
</span><span class="cx"> WebInspector.TimelineRuler.DividerElementStyleClassName = "divider";
</span><span class="cx"> WebInspector.TimelineRuler.DividerLabelElementStyleClassName = "label";
</span></span></pre>
</div>
</div>
</body>
</html>