<!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>[198026] 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/198026">198026</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-03-11 10:30:13 -0800 (Fri, 11 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Make it possible to disable TimelineRuler UI
https://bugs.webkit.org/show_bug.cgi?id=155348
<rdar://problem/25103505>
Reviewed by Timothy Hatcher.
Adds an "enabled" property to TimelineRuler, allowing the selection UI
to be disabled without removing the current selection.
* UserInterface/Views/TimelineRuler.css:
(.timeline-ruler.allows-time-range-selection:not(.disabled)):
(.timeline-ruler > .selection-drag):
(.timeline-ruler:not(.disabled) > .selection-drag):
(.timeline-ruler:not(.disabled) > .selection-drag:active):
(.timeline-ruler.disabled > .selection-handle):
(.timeline-ruler.allows-time-range-selection): Deleted.
(.timeline-ruler > .selection-drag:active): Deleted.
Updated ruler styles for "disabled" state: pointer events are disabled,
selection handles hidden, and the default cursor is shown.
* UserInterface/Views/TimelineRuler.js:
(WebInspector.TimelineRuler):
(WebInspector.TimelineRuler.prototype.get enabled):
(WebInspector.TimelineRuler.prototype.set enabled):
New property.
(WebInspector.TimelineRuler.prototype._handleClick):
Corrected code which always reset the pointer events to "all", instead
of setting it back to the original value.</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 (198025 => 198026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-03-11 18:02:27 UTC (rev 198025)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-03-11 18:30:13 UTC (rev 198026)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-03-11 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Make it possible to disable TimelineRuler UI
+ https://bugs.webkit.org/show_bug.cgi?id=155348
+ <rdar://problem/25103505>
+
+ Reviewed by Timothy Hatcher.
+
+ Adds an "enabled" property to TimelineRuler, allowing the selection UI
+ to be disabled without removing the current selection.
+
+ * UserInterface/Views/TimelineRuler.css:
+ (.timeline-ruler.allows-time-range-selection:not(.disabled)):
+ (.timeline-ruler > .selection-drag):
+ (.timeline-ruler:not(.disabled) > .selection-drag):
+ (.timeline-ruler:not(.disabled) > .selection-drag:active):
+ (.timeline-ruler.disabled > .selection-handle):
+ (.timeline-ruler.allows-time-range-selection): Deleted.
+ (.timeline-ruler > .selection-drag:active): Deleted.
+ Updated ruler styles for "disabled" state: pointer events are disabled,
+ selection handles hidden, and the default cursor is shown.
+
+ * UserInterface/Views/TimelineRuler.js:
+ (WebInspector.TimelineRuler):
+ (WebInspector.TimelineRuler.prototype.get enabled):
+ (WebInspector.TimelineRuler.prototype.set enabled):
+ New property.
+ (WebInspector.TimelineRuler.prototype._handleClick):
+ Corrected code which always reset the pointer events to "all", instead
+ of setting it back to the original value.
+
</ins><span class="cx"> 2016-03-10 Daniel Strokis <dstrokis@icloud.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: color swatch and border are misaligned in Visual Styles sidebar
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulercss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css (198025 => 198026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css 2016-03-11 18:02:27 UTC (rev 198025)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css 2016-03-11 18:30:13 UTC (rev 198026)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> z-index: 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.timeline-ruler.allows-time-range-selection {
</del><ins>+.timeline-ruler.allows-time-range-selection:not(.disabled) {
</ins><span class="cx"> pointer-events: all;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -157,11 +157,14 @@
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: 0;
</span><span class="cx"> height: 23px;
</span><ins>+}
+
+.timeline-ruler:not(.disabled) > .selection-drag {
</ins><span class="cx"> cursor: -webkit-grab;
</span><span class="cx"> pointer-events: all;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.timeline-ruler > .selection-drag:active {
</del><ins>+.timeline-ruler:not(.disabled) > .selection-drag:active {
</ins><span class="cx"> cursor: -webkit-grabbing;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -178,6 +181,10 @@
</span><span class="cx"> z-index: 15;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.timeline-ruler.disabled > .selection-handle {
+ display: none;
+}
+
</ins><span class="cx"> .timeline-ruler.selection-hidden > :matches(.selection-drag, .selection-handle, .shaded-area) {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRulerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js (198025 => 198026)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2016-03-11 18:02:27 UTC (rev 198025)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js 2016-03-11 18:30:13 UTC (rev 198026)
</span><span class="lines">@@ -53,12 +53,27 @@
</span><span class="cx"> this._minimumSelectionDuration = 0.01;
</span><span class="cx"> this._formatLabelCallback = null;
</span><span class="cx"> this._timeRangeSelectionChanged = false;
</span><ins>+ this._enabled = true;
</ins><span class="cx">
</span><span class="cx"> this._markerElementMap = new Map;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><ins>+ get enabled()
+ {
+ return this._enabled;
+ }
+
+ set enabled(x)
+ {
+ if (this._enabled === x)
+ return;
+
+ this._enabled = x;
+ this.element.classList.toggle(WebInspector.TreeElementStatusButton.DisabledStyleClassName, !this._enabled);
+ }
+
</ins><span class="cx"> get allowsClippedLabels()
</span><span class="cx"> {
</span><span class="cx"> return this._allowsClippedLabels;
</span><span class="lines">@@ -700,12 +715,15 @@
</span><span class="cx">
</span><span class="cx"> _handleClick(event)
</span><span class="cx"> {
</span><del>- if (this._mouseMoved)
</del><ins>+ if (!this._enabled)
</ins><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!this._mouseMoved)
+ return;
+
</ins><span class="cx"> this.element.style.pointerEvents = "none";
</span><span class="cx"> let newTarget = document.elementFromPoint(event.pageX, event.pageY);
</span><del>- this.element.style.pointerEvents = "all";
</del><ins>+ this.element.style.pointerEvents = null;
</ins><span class="cx">
</span><span class="cx"> if (newTarget && newTarget.click)
</span><span class="cx"> newTarget.click();
</span></span></pre>
</div>
</div>
</body>
</html>