Title: [186540] trunk/Source/WebInspectorUI
- Revision
- 186540
- Author
- timo...@apple.com
- Date
- 2015-07-08 16:54:17 -0700 (Wed, 08 Jul 2015)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (186539 => 186540)
--- 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)
@@ -1,3 +1,27 @@
+2015-07-08 Timothy Hatcher <timo...@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.
+
2015-07-08 Devin Rousso <drou...@apple.com>
Web Inspector: Confusingly crossed out properties in .sidebar > .panel.navigation.timeline > .title-bar
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (186539 => 186540)
--- 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)
@@ -31,7 +31,9 @@
WebInspector.ContentView.call(this, representedObject);
this._networkSidebarPanel = extraArguments.networkSidebarPanel;
+
this._contentTreeOutline = this._networkSidebarPanel.contentTreeOutline;
+ this._contentTreeOutline._onselect_ = this._treeElementSelected.bind(this);
var columns = {domain: {}, type: {}, method: {}, scheme: {}, statusCode: {}, cached: {}, size: {}, transferSize: {}, requestSent: {}, latency: {}, duration: {}};
@@ -210,6 +212,21 @@
dataGridNode.revealAndSelect();
},
+ _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);
+ },
+
_dataGridNodeSelected: function(event)
{
this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js (186539 => 186540)
--- 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)
@@ -58,7 +58,6 @@
this._navigationBar.addNavigationItem(this._scopeBar);
- this.contentTreeOutline._onselect_ = this._treeElementSelected.bind(this);
this.contentTreeOutline.element.classList.add("network-grid");
this.contentTreeOutline.element.classList.add(WebInspector.NavigationSidebarPanel.HideDisclosureButtonsStyleClassName);
@@ -84,6 +83,17 @@
this.contentBrowser.showContentView(this._networkGridView);
}
+ canShowDifferentContentView()
+ {
+ if (this._clickedTreeElementGoToArrow)
+ return true;
+
+ if (this.contentBrowser.currentContentView instanceof WebInspector.NetworkGridContentView)
+ return false;
+
+ return !this.restoringState || !this._restoredShowingNetworkGridContentView;
+ }
+
// Protected
saveStateToCookie(cookie)
@@ -200,30 +210,6 @@
this.contentTreeOutline.processingSelectionChange = false;
}
- _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);
- }
-
_scopeBarSelectionDidChange(event)
{
this.updateFilter();
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineView.js (186539 => 186540)
--- 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)
@@ -238,6 +238,8 @@
{
// Implemented by sub-classes if needed.
+ this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
+
if (!this._timelineSidebarPanel.canShowDifferentContentView())
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
