<!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>[186540] 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/186540">186540</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-07-08 16:54:17 -0700 (Wed, 08 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Details sidebar doesn't activate on first selected resource in Network tab
https://bugs.webkit.org/show_bug.cgi?id=146691
Make sure the SelectionPathComponentsDidChange event is dispatched when the tree elements are selected.
Selecting in the DataGrid selects the TreeElements, but onselect is not fired to avoid an inifinte loop.
Reviewed by Joseph Pecoraro.
* UserInterface/Views/NetworkGridContentView.js:
(WebInspector.NetworkGridContentView): Hook up _treeElementSelected.
(WebInspector.NetworkGridContentView.prototype._treeElementSelected): Added. Moved from
NetworkSidebarPanel and added dispatch of SelectionPathComponentsDidChange event.
* UserInterface/Views/NetworkSidebarPanel.js:
(WebInspector.NetworkSidebarPanel): Removed _treeElementSelected.
(WebInspector.NetworkSidebarPanel.prototype.canShowDifferentContentView): Renamed from _canShowDifferentContentView.
(WebInspector.NetworkSidebarPanel.prototype._canShowDifferentContentView): Deleted.
(WebInspector.NetworkSidebarPanel.prototype._treeElementSelected): Moved to NetworkGridContentView.
* UserInterface/Views/TimelineView.js:
(WebInspector.TimelineView.prototype.treeElementSelected): Dispatch SelectionPathComponentsDidChange event.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (186539 => 186540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-07-08 23:50:02 UTC (rev 186539)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-07-08 23:54:17 UTC (rev 186540)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-07-08 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Details sidebar doesn't activate on first selected resource in Network tab
+ https://bugs.webkit.org/show_bug.cgi?id=146691
+
+ Make sure the SelectionPathComponentsDidChange event is dispatched when the tree elements are selected.
+ Selecting in the DataGrid selects the TreeElements, but onselect is not fired to avoid an inifinte loop.
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/NetworkGridContentView.js:
+ (WebInspector.NetworkGridContentView): Hook up _treeElementSelected.
+ (WebInspector.NetworkGridContentView.prototype._treeElementSelected): Added. Moved from
+ NetworkSidebarPanel and added dispatch of SelectionPathComponentsDidChange event.
+
+ * UserInterface/Views/NetworkSidebarPanel.js:
+ (WebInspector.NetworkSidebarPanel): Removed _treeElementSelected.
+ (WebInspector.NetworkSidebarPanel.prototype.canShowDifferentContentView): Renamed from _canShowDifferentContentView.
+ (WebInspector.NetworkSidebarPanel.prototype._canShowDifferentContentView): Deleted.
+ (WebInspector.NetworkSidebarPanel.prototype._treeElementSelected): Moved to NetworkGridContentView.
+
+ * UserInterface/Views/TimelineView.js:
+ (WebInspector.TimelineView.prototype.treeElementSelected): Dispatch SelectionPathComponentsDidChange event.
+
</ins><span class="cx"> 2015-07-08 Devin Rousso <drousso@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Confusingly crossed out properties in .sidebar > .panel.navigation.timeline > .title-bar
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (186539 => 186540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2015-07-08 23:50:02 UTC (rev 186539)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2015-07-08 23:54:17 UTC (rev 186540)
</span><span class="lines">@@ -31,7 +31,9 @@
</span><span class="cx"> WebInspector.ContentView.call(this, representedObject);
</span><span class="cx">
</span><span class="cx"> this._networkSidebarPanel = extraArguments.networkSidebarPanel;
</span><ins>+
</ins><span class="cx"> this._contentTreeOutline = this._networkSidebarPanel.contentTreeOutline;
</span><ins>+ this._contentTreeOutline.onselect = this._treeElementSelected.bind(this);
</ins><span class="cx">
</span><span class="cx"> var columns = {domain: {}, type: {}, method: {}, scheme: {}, statusCode: {}, cached: {}, size: {}, transferSize: {}, requestSent: {}, latency: {}, duration: {}};
</span><span class="cx">
</span><span class="lines">@@ -210,6 +212,21 @@
</span><span class="cx"> dataGridNode.revealAndSelect();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ _treeElementSelected: function(treeElement, selectedByUser)
+ {
+ this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
+
+ if (!this._networkSidebarPanel.canShowDifferentContentView())
+ return;
+
+ if (treeElement instanceof WebInspector.ResourceTreeElement) {
+ WebInspector.showRepresentedObject(treeElement.representedObject);
+ return;
+ }
+
+ console.error("Unknown tree element", treeElement);
+ },
+
</ins><span class="cx"> _dataGridNodeSelected: function(event)
</span><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js (186539 => 186540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js 2015-07-08 23:50:02 UTC (rev 186539)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js 2015-07-08 23:54:17 UTC (rev 186540)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx">
</span><span class="cx"> this._navigationBar.addNavigationItem(this._scopeBar);
</span><span class="cx">
</span><del>- this.contentTreeOutline.onselect = this._treeElementSelected.bind(this);
</del><span class="cx"> this.contentTreeOutline.element.classList.add("network-grid");
</span><span class="cx"> this.contentTreeOutline.element.classList.add(WebInspector.NavigationSidebarPanel.HideDisclosureButtonsStyleClassName);
</span><span class="cx">
</span><span class="lines">@@ -84,6 +83,17 @@
</span><span class="cx"> this.contentBrowser.showContentView(this._networkGridView);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ canShowDifferentContentView()
+ {
+ if (this._clickedTreeElementGoToArrow)
+ return true;
+
+ if (this.contentBrowser.currentContentView instanceof WebInspector.NetworkGridContentView)
+ return false;
+
+ return !this.restoringState || !this._restoredShowingNetworkGridContentView;
+ }
+
</ins><span class="cx"> // Protected
</span><span class="cx">
</span><span class="cx"> saveStateToCookie(cookie)
</span><span class="lines">@@ -200,30 +210,6 @@
</span><span class="cx"> this.contentTreeOutline.processingSelectionChange = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _canShowDifferentContentView()
- {
- if (this._clickedTreeElementGoToArrow)
- return true;
-
- if (this.contentBrowser.currentContentView instanceof WebInspector.NetworkGridContentView)
- return false;
-
- return !this.restoringState || !this._restoredShowingNetworkGridContentView;
- }
-
- _treeElementSelected(treeElement, selectedByUser)
- {
- if (!this._canShowDifferentContentView())
- return;
-
- if (treeElement instanceof WebInspector.ResourceTreeElement) {
- WebInspector.showRepresentedObject(treeElement.representedObject);
- return;
- }
-
- console.error("Unknown tree element", treeElement);
- }
-
</del><span class="cx"> _scopeBarSelectionDidChange(event)
</span><span class="cx"> {
</span><span class="cx"> this.updateFilter();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js (186539 => 186540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2015-07-08 23:50:02 UTC (rev 186539)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js 2015-07-08 23:54:17 UTC (rev 186540)
</span><span class="lines">@@ -238,6 +238,8 @@
</span><span class="cx"> {
</span><span class="cx"> // Implemented by sub-classes if needed.
</span><span class="cx">
</span><ins>+ this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
+
</ins><span class="cx"> if (!this._timelineSidebarPanel.canShowDifferentContentView())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>