<!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>[199077] 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/199077">199077</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2016-04-05 15:32:03 -0700 (Tue, 05 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Should not allow selecting no Timelines when editing in Timeline tab
https://bugs.webkit.org/show_bug.cgi?id=156223
<rdar://problem/25552221>
Reviewed by Joseph Pecoraro.
* UserInterface/Views/TimelineOverview.js:
(WebInspector.TimelineOverview):
(WebInspector.TimelineOverview.prototype._startEditingInstruments):
Register EnabledDidChange event handler for all tree elements.
(WebInspector.TimelineOverview.prototype._stopEditingInstruments):
Unregister event handler for enabled tree elements. The rest are removed
from the tree outline once editing has completed.
(WebInspector.TimelineOverview.prototype._timelineTreeElementEnabledDidChange):
Enable "Done" button if at least one timeline is enabled.
* UserInterface/Views/TimelineTreeElement.js:
Dispatch a new event, EnabledDidChange, when the checkbox state changes.
(WebInspector.TimelineTreeElement.prototype._showCheckbox):
(WebInspector.TimelineTreeElement.prototype._clickHandler):
(WebInspector.TimelineTreeElement.prototype._dispatchEnabledDidChangeEvent):
(WebInspector.TimelineTreeElement):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTreeElement.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (199076 => 199077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-05 22:17:35 UTC (rev 199076)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-05 22:32:03 UTC (rev 199077)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-04-05 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: Should not allow selecting no Timelines when editing in Timeline tab
+ https://bugs.webkit.org/show_bug.cgi?id=156223
+ <rdar://problem/25552221>
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/TimelineOverview.js:
+ (WebInspector.TimelineOverview):
+ (WebInspector.TimelineOverview.prototype._startEditingInstruments):
+ Register EnabledDidChange event handler for all tree elements.
+
+ (WebInspector.TimelineOverview.prototype._stopEditingInstruments):
+ Unregister event handler for enabled tree elements. The rest are removed
+ from the tree outline once editing has completed.
+
+ (WebInspector.TimelineOverview.prototype._timelineTreeElementEnabledDidChange):
+ Enable "Done" button if at least one timeline is enabled.
+
+ * UserInterface/Views/TimelineTreeElement.js:
+ Dispatch a new event, EnabledDidChange, when the checkbox state changes.
+
+ (WebInspector.TimelineTreeElement.prototype._showCheckbox):
+ (WebInspector.TimelineTreeElement.prototype._clickHandler):
+ (WebInspector.TimelineTreeElement.prototype._dispatchEnabledDidChangeEvent):
+ (WebInspector.TimelineTreeElement):
+
</ins><span class="cx"> 2016-04-04 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Uncaught Exception: Error: Can't make a ContentView for an unknown representedObject (ApplicationCacheManifest)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineOverviewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js (199076 => 199077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2016-04-05 22:17:35 UTC (rev 199076)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js 2016-04-05 22:32:03 UTC (rev 199077)
</span><span class="lines">@@ -876,6 +876,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> treeElement.editing = true;
</span><ins>+ treeElement.addEventListener(WebInspector.TimelineTreeElement.Event.EnabledDidChange, this._timelineTreeElementEnabledDidChange, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._editingInstrumentsDidChange();
</span><span class="lines">@@ -892,6 +893,7 @@
</span><span class="cx"> for (let treeElement of this._treeElementsByTypeMap.values()) {
</span><span class="cx"> if (treeElement.status.checked) {
</span><span class="cx"> treeElement.editing = false;
</span><ins>+ treeElement.removeEventListener(WebInspector.TimelineTreeElement.Event.EnabledDidChange, this._timelineTreeElementEnabledDidChange, this);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -944,6 +946,16 @@
</span><span class="cx"> let bTimelineIndex = this._instrumentTypes.indexOf(bTimelineType);
</span><span class="cx"> return aTimelineIndex - bTimelineIndex;
</span><span class="cx"> }
</span><ins>+
+ _timelineTreeElementEnabledDidChange(event)
+ {
+ let enabled = this._timelinesTreeOutline.children.some((treeElement) => {
+ let timelineType = treeElement.representedObject.type;
+ return this._canShowTimelineType(timelineType) && treeElement.status.checked;
+ });
+
+ this._editInstrumentsButton.enabled = enabled;
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.TimelineOverview.ScrollDeltaDenominator = 500;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTreeElement.js (199076 => 199077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTreeElement.js 2016-04-05 22:17:35 UTC (rev 199076)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTreeElement.js 2016-04-05 22:32:03 UTC (rev 199077)
</span><span class="lines">@@ -87,6 +87,8 @@
</span><span class="cx"> checkboxElement.checked = !this._placeholder;
</span><span class="cx">
</span><span class="cx"> let button = new WebInspector.TreeElementStatusButton(checkboxElement);
</span><ins>+ checkboxElement.addEventListener("change", () => { this._dispatchEnabledDidChangeEvent(); });
+
</ins><span class="cx"> this.status = checkboxElement;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -104,5 +106,15 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this.status.checked = !this.status.checked;
</span><ins>+ this._dispatchEnabledDidChangeEvent();
</ins><span class="cx"> }
</span><ins>+
+ _dispatchEnabledDidChangeEvent()
+ {
+ this.dispatchEventToListeners(WebInspector.TimelineTreeElement.Event.EnabledDidChange);
+ }
</ins><span class="cx"> };
</span><ins>+
+WebInspector.TimelineTreeElement.Event = {
+ EnabledDidChange: "timeline-tree-element-enabled-did-change"
+};
</ins></span></pre>
</div>
</div>
</body>
</html>