Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (212760 => 212761)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-02-21 22:44:29 UTC (rev 212761)
@@ -1,3 +1,63 @@
+2017-02-21 Devin Rousso <[email protected]>
+
+ Web Inspector: Prefer Resources tab over Network tab when showing files
+ https://bugs.webkit.org/show_bug.cgi?id=168021
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.handlePossibleLinkClick):
+ (WebInspector.openURL):
+ Add `options` parameter to provide greater customization.
+
+ * UserInterface/Views/TabBrowser.js:
+ (WebInspector.TabBrowser.prototype.bestTabContentViewForRepresentedObject):
+ Add logic for `ignoreNetworkTab` option that will ignore instances of NetworkTabContentView.
+
+ * UserInterface/Controllers/BreakpointPopoverController.js:
+ (WebInspector.BreakpointPopoverController.prototype.appendContextMenuItems):
+ * UserInterface/Protocol/InspectorFrontendAPI.js:
+ (InspectorFrontendAPI.showMainResourceForFrame):
+ * UserInterface/Views/CSSStyleDeclarationTextEditor.js:
+ (WebInspector.CSSStyleDeclarationTextEditor.tokenTrackingControllerHighlightedRangeWasClicked.showRangeInSourceCode):
+ * UserInterface/Views/ComputedStyleDetailsPanel.js:
+ (WebInspector.ComputedStyleDetailsPanel.prototype.cssStyleDeclarationTextEditorShowProperty):
+ * UserInterface/Views/ContextMenuUtilities.js:
+ (WebInspector.appendContextMenuItemsForSourceCode):
+ * UserInterface/Views/DOMTreeContentView.js:
+ (WebInspector.DOMTreeContentView.prototype._mouseWasClicked.followLink):
+ * UserInterface/Views/DOMTreeElement.js:
+ (WebInspector.DOMTreeElement.prototype._populateTagContextMenu):
+ (WebInspector.DOMTreeElement.prototype._showCustomElementDefinition):
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel.prototype._treeSelectionDidChange):
+ * UserInterface/Views/NetworkTimelineView.js:
+ (WebInspector.NetworkTimelineView.prototype.showContentViewForTreeElement):
+ * UserInterface/Views/ObjectTreeBaseTreeElement.js:
+ (WebInspector.ObjectTreeBaseTreeElement.prototype._appendMenusItemsForObject):
+ * UserInterface/Views/ResourceSidebarPanel.js:
+ (WebInspector.ResourceSidebarPanel.prototype._treeSelectionDidChange):
+ * UserInterface/Views/ResourceTimelineDataGridNode.js:
+ (WebInspector.ResourceTimelineDataGridNode.prototype._dataGridNodeGoToArrowClicked):
+ * UserInterface/Views/SearchSidebarPanel.js:
+ (WebInspector.SearchSidebarPanel.prototype._treeSelectionDidChange):
+ (WebInspector.SearchSidebarPanel.prototype._treeElementDoubleClick):
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor.prototype.tokenTrackingControllerHighlightedRangeWasClicked):
+ * UserInterface/Views/TimelineDataGrid.js:
+ (WebInspector.TimelineDataGrid.prototype._popoverCallStackTreeSelectionDidChange):
+ * UserInterface/Views/VisualStyleSelectorTreeItem.js:
+ (WebInspector.VisualStyleSelectorTreeItem.prototype.populateContextMenu):
+ Change arguments of functions to change content views to ignore the Network tab.
+
+ * UserInterface/Views/NetworkGridContentView.js:
+ (WebInspector.NetworkGridContentView.prototype.hasRepresentedObject):
+ * UserInterface/Views/NetworkSidebarPanel.js:
+ (WebInspector.NetworkSidebarPanel.prototype.hasRepresentedObject):
+ * UserInterface/Views/NetworkTabContentView.js:
+ (WebInspector.NetworkTabContentView.prototype.canShowRepresentedObject):
+ Ensure that the Network tab can only display resources that it has entries for in its view.
+
2017-02-21 Brian Burg <[email protected]>
Web Inspector: RTL: console scope bar's unread message indicator is misaligned
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -810,24 +810,24 @@
event.preventDefault();
event.stopPropagation();
- this.openURL(anchorElement.href, frame, false, anchorElement.lineNumber);
+ this.openURL(anchorElement.href, frame, {lineNumber: anchorElement.lineNumber});
return true;
};
-WebInspector.openURL = function(url, frame, alwaysOpenExternally, lineNumber)
+WebInspector.openURL = function(url, frame, options = {})
{
console.assert(url);
if (!url)
return;
- console.assert(typeof lineNumber === "undefined" || typeof lineNumber === "number", "lineNumber should be a number.");
+ console.assert(typeof options.lineNumber === "undefined" || typeof options.lineNumber === "number", "lineNumber should be a number.");
// If alwaysOpenExternally is not defined, base it off the command/meta key for the current event.
- if (alwaysOpenExternally === undefined || alwaysOpenExternally === null)
- alwaysOpenExternally = window.event ? window.event.metaKey : false;
+ if (options.alwaysOpenExternally === undefined || options.alwaysOpenExternally === null)
+ options.alwaysOpenExternally = window.event ? window.event.metaKey : false;
- if (alwaysOpenExternally) {
+ if (options.alwaysOpenExternally) {
InspectorFrontendHost.openInNewTab(url);
return;
}
@@ -844,8 +844,8 @@
let simplifiedURL = removeURLFragment(url);
var resource = frame.url ="" simplifiedURL ? frame.mainResource : frame.resourceForURL(simplifiedURL, searchChildFrames);
if (resource) {
- var position = new WebInspector.SourceCodePosition(lineNumber, 0);
- this.showSourceCode(resource, position);
+ let positionToReveal = new WebInspector.SourceCodePosition(options.lineNumber, 0);
+ this.showSourceCode(resource, Object.shallowMerge(options, {positionToReveal}));
return;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/BreakpointPopoverController.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/BreakpointPopoverController.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/BreakpointPopoverController.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -67,7 +67,7 @@
};
const revealOriginalSourceCodeLocation = () => {
- WebInspector.showOriginalOrFormattedSourceCodeLocation(breakpoint.sourceCodeLocation);
+ WebInspector.showOriginalOrFormattedSourceCodeLocation(breakpoint.sourceCodeLocation, {ignoreNetworkTab: true});
};
if (WebInspector.debuggerManager.isBreakpointEditable(breakpoint))
Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -109,7 +109,7 @@
showMainResourceForFrame: function(frameIdentifier)
{
- WebInspector.showSourceCodeForFrame(frameIdentifier);
+ WebInspector.showSourceCodeForFrame(frameIdentifier, {ignoreNetworkTab: true});
},
contextMenuItemSelected: function(id)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -1680,7 +1680,7 @@
if (!sourceCode || !range)
return false;
- WebInspector.showSourceCodeLocation(sourceCode.createSourceCodeLocation(range.startLine, range.startColumn));
+ WebInspector.showSourceCodeLocation(sourceCode.createSourceCodeLocation(range.startLine, range.startColumn), {ignoreNetworkTab: true});
return true;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ComputedStyleDetailsPanel.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -103,7 +103,7 @@
let sourceCode = ownerRule.sourceCodeLocation.sourceCode;
let {startLine, startColumn} = effectiveProperty.styleSheetTextRange;
let sourceCodeLocation = sourceCode.createSourceCodeLocation(startLine, startColumn);
- WebInspector.showSourceCodeLocation(sourceCodeLocation);
+ WebInspector.showSourceCodeLocation(sourceCodeLocation, {ignoreNetworkTab: true});
}
refresh(significantChange)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -38,8 +38,7 @@
if (sourceCode.url) {
contextMenu.appendItem(WebInspector.UIString("Open in New Tab"), () => {
const frame = null;
- const alwaysOpenExternally = true;
- WebInspector.openURL(sourceCode.url, frame, alwaysOpenExternally);
+ WebInspector.openURL(sourceCode.url, frame, {alwaysOpenExternally: true});
});
contextMenu.appendItem(WebInspector.UIString("Copy Link Address"), () => {
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -431,7 +431,7 @@
// to see if the command key is down like it normally would. So we need to do that check
// before calling WebInspector.openURL.
var alwaysOpenExternally = event ? event.metaKey : false;
- WebInspector.openURL(anchorElement.href, this._frame, alwaysOpenExternally, anchorElement.lineNumber);
+ WebInspector.openURL(anchorElement.href, this._frame, {alwaysOpenExternally, lineNumber: anchorElement.lineNumber});
}
// Start a timeout since this is a single click, if the timeout is canceled before it fires,
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -652,14 +652,13 @@
contextMenu.appendItem(WebInspector.UIString("Open in New Tab"), () => {
const frame = null;
- const alwaysOpenExternally = true;
- WebInspector.openURL(url, frame, alwaysOpenExternally);
+ WebInspector.openURL(url, frame, {alwaysOpenExternally: true});
});
if (WebInspector.frameResourceManager.resourceForURL(url)) {
contextMenu.appendItem(WebInspector.UIString("Reveal in Resources Tab"), () => {
let frame = WebInspector.frameResourceManager.frameForIdentifier(node.frameIdentifier);
- WebInspector.openURL(url, frame);
+ WebInspector.openURL(url, frame, {ignoreNetworkTab: true});
});
}
@@ -1514,7 +1513,7 @@
return;
let sourceCodeLocation = sourceCode.createSourceCodeLocation(location.lineNumber, location.columnNumber || 0);
- WebInspector.showSourceCodeLocation(sourceCodeLocation);
+ WebInspector.showSourceCodeLocation(sourceCodeLocation, {ignoreNetworkTab: true});
});
result.release();
});
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -782,7 +782,7 @@
return;
if (treeElement instanceof WebInspector.ResourceTreeElement || treeElement instanceof WebInspector.ScriptTreeElement) {
- WebInspector.showSourceCode(treeElement.representedObject);
+ WebInspector.showSourceCode(treeElement.representedObject, {ignoreNetworkTab: true});
return;
}
@@ -792,12 +792,12 @@
WebInspector.debuggerManager.activeCallFrame = callFrame;
if (callFrame.sourceCodeLocation)
- WebInspector.showSourceCodeLocation(callFrame.sourceCodeLocation);
+ WebInspector.showSourceCodeLocation(callFrame.sourceCodeLocation, {ignoreNetworkTab: true});
return;
}
if (treeElement instanceof WebInspector.IssueTreeElement) {
- WebInspector.showSourceCodeLocation(treeElement.issueMessage.sourceCodeLocation);
+ WebInspector.showSourceCodeLocation(treeElement.issueMessage.sourceCodeLocation, {ignoreNetworkTab: true});
return;
}
@@ -806,7 +806,7 @@
let breakpoint = treeElement.breakpoint;
if (treeElement.treeOutline === this._pauseReasonTreeOutline) {
- WebInspector.showSourceCodeLocation(breakpoint.sourceCodeLocation);
+ WebInspector.showSourceCodeLocation(breakpoint.sourceCodeLocation, {ignoreNetworkTab: true});
return;
}
@@ -817,7 +817,7 @@
if (!(treeElement.parent.representedObject instanceof WebInspector.SourceCode))
return;
- WebInspector.showSourceCodeLocation(breakpoint.sourceCodeLocation);
+ WebInspector.showSourceCodeLocation(breakpoint.sourceCodeLocation, {ignoreNetworkTab: true});
}
_compareTopLevelTreeElements(a, b)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -225,6 +225,15 @@
this.reset();
}
+ hasRepresentedObject(representedObject)
+ {
+ const comparator = (dataGridNode) => dataGridNode.resource === representedObject;
+ const skipHidden = true;
+ const stayWithin = false;
+ const dontPopulate = true;
+ return this._dataGrid.findNode(comparator, skipHidden, stayWithin, dontPopulate);
+ }
+
// Private
_processPendingRecords()
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -94,6 +94,11 @@
return !this.restoringState || !this._restoredShowingNetworkGridContentView;
}
+ hasRepresentedObject(representedObject)
+ {
+ return this._networkGridView.hasRepresentedObject(representedObject);
+ }
+
// Protected
saveStateToCookie(cookie)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -56,7 +56,10 @@
canShowRepresentedObject(representedObject)
{
- return representedObject instanceof WebInspector.Resource;
+ if (!(representedObject instanceof WebInspector.Resource))
+ return false;
+
+ return this._navigationSidebarPanel.hasRepresentedObject(representedObject);
}
get supportsSplitContentBrowser()
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -188,7 +188,7 @@
showContentViewForTreeElement(treeElement)
{
if (treeElement instanceof WebInspector.ResourceTreeElement || treeElement instanceof WebInspector.ScriptTreeElement) {
- WebInspector.showSourceCode(treeElement.representedObject);
+ WebInspector.showSourceCode(treeElement.representedObject, {ignoreNetworkTab: true});
return;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -228,7 +228,7 @@
return;
let sourceCodeLocation = sourceCode.createSourceCodeLocation(location.lineNumber, location.columnNumber || 0);
- WebInspector.showSourceCodeLocation(sourceCodeLocation);
+ WebInspector.showSourceCodeLocation(sourceCodeLocation, {ignoreNetworkTab: true});
});
});
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -422,7 +422,7 @@
|| treeElement instanceof WebInspector.ResourceTreeElement
|| treeElement instanceof WebInspector.ScriptTreeElement
|| treeElement instanceof WebInspector.ContentFlowTreeElement) {
- WebInspector.showRepresentedObject(treeElement.representedObject);
+ WebInspector.showRepresentedObject(treeElement.representedObject, null, {ignoreNetworkTab: true});
return;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -240,7 +240,7 @@
_dataGridNodeGoToArrowClicked()
{
- WebInspector.showSourceCode(this._resource);
+ WebInspector.showSourceCode(this._resource, {ignoreNetworkTab: true});
}
_updateStatus(cell)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SearchSidebarPanel.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -356,7 +356,7 @@
return;
if (treeElement instanceof WebInspector.ResourceTreeElement || treeElement instanceof WebInspector.ScriptTreeElement) {
- WebInspector.showRepresentedObject(treeElement.representedObject);
+ WebInspector.showRepresentedObject(treeElement.representedObject, null, {ignoreNetworkTab: true});
return;
}
@@ -367,7 +367,7 @@
if (treeElement.representedObject instanceof WebInspector.DOMSearchMatchObject)
WebInspector.showMainFrameDOMTree(treeElement.representedObject.domNode);
else if (treeElement.representedObject instanceof WebInspector.SourceCodeSearchMatchObject)
- WebInspector.showOriginalOrFormattedSourceCodeTextRange(treeElement.representedObject.sourceCodeTextRange);
+ WebInspector.showOriginalOrFormattedSourceCodeTextRange(treeElement.representedObject.sourceCodeTextRange, {ignoreNetworkTab: true});
}
_treeElementDoubleClick(event)
@@ -376,10 +376,9 @@
if (!treeElement)
return;
- const options = {ignoreSearchTab: true};
if (treeElement.representedObject instanceof WebInspector.DOMSearchMatchObject)
- WebInspector.showMainFrameDOMTree(treeElement.representedObject.domNode, options);
+ WebInspector.showMainFrameDOMTree(treeElement.representedObject.domNode, {ignoreSearchTab: true});
else if (treeElement.representedObject instanceof WebInspector.SourceCodeSearchMatchObject)
- WebInspector.showOriginalOrFormattedSourceCodeTextRange(treeElement.representedObject.sourceCodeTextRange, options);
+ WebInspector.showOriginalOrFormattedSourceCodeTextRange(treeElement.representedObject.sourceCodeTextRange, {ignoreNetworkTab: true, ignoreSearchTab: true});
}
};
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -1669,9 +1669,9 @@
var sourceCodeLocation = this._sourceCodeLocationForEditorPosition(this.tokenTrackingController.candidate.hoveredTokenRange.start);
if (this.sourceCode instanceof WebInspector.SourceMapResource)
- WebInspector.showOriginalOrFormattedSourceCodeLocation(sourceCodeLocation);
+ WebInspector.showOriginalOrFormattedSourceCodeLocation(sourceCodeLocation, {ignoreNetworkTab: true});
else
- WebInspector.showSourceCodeLocation(sourceCodeLocation);
+ WebInspector.showSourceCodeLocation(sourceCodeLocation, {ignoreNetworkTab: true});
}
tokenTrackingControllerNewHighlightCandidate(tokenTrackingController, candidate)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -115,6 +115,9 @@
if (options.ignoreSearchTab && tabContentView instanceof WebInspector.SearchTabContentView)
continue;
+ if (options.ignoreNetworkTab && tabContentView instanceof WebInspector.NetworkTabContentView)
+ continue;
+
if (tabContentView.canShowRepresentedObject(representedObject))
return tabContentView;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -525,7 +525,7 @@
if (!callFrame.sourceCodeLocation)
return;
- WebInspector.showSourceCodeLocation(callFrame.sourceCodeLocation);
+ WebInspector.showSourceCodeLocation(callFrame.sourceCodeLocation, {ignoreNetworkTab: true});
}
};
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorTreeItem.js (212760 => 212761)
--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorTreeItem.js 2017-02-21 22:44:14 UTC (rev 212760)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorTreeItem.js 2017-02-21 22:44:29 UTC (rev 212761)
@@ -138,9 +138,9 @@
contextMenu.appendItem(WebInspector.UIString("Show Source"), () => {
if (event.metaKey)
- WebInspector.showOriginalUnformattedSourceCodeLocation(this.representedObject.ownerRule.sourceCodeLocation);
+ WebInspector.showOriginalUnformattedSourceCodeLocation(this.representedObject.ownerRule.sourceCodeLocation, {ignoreNetworkTab: true});
else
- WebInspector.showSourceCodeLocation(this.representedObject.ownerRule.sourceCodeLocation);
+ WebInspector.showSourceCodeLocation(this.representedObject.ownerRule.sourceCodeLocation, {ignoreNetworkTab: true});
});
// Only used one colon temporarily since single-colon pseudo elements are valid CSS.
