Title: [226347] trunk/Source/WebInspectorUI
- Revision
- 226347
- Author
- commit-qu...@webkit.org
- Date
- 2018-01-02 18:52:04 -0800 (Tue, 02 Jan 2018)
Log Message
Web Inspector: Clicking source location link in Console unexpectedly jumps to Network tab
https://bugs.webkit.org/show_bug.cgi?id=181229
<rdar://problem/36075219>
Patch by Joseph Pecoraro <pecor...@apple.com> on 2018-01-02
Reviewed by Matt Baker.
* UserInterface/Base/Main.js:
Cleanup linkifyURLAsNode. Ignore Search tab in generic handlePossibleLinkClick
when not already in the Search tab.
* UserInterface/Views/CallFrameView.js:
(WI.CallFrameView):
Ignore Search and Network tab in CallFrame links.
* UserInterface/Views/TabBrowser.js:
(WI.TabBrowser.prototype.bestTabContentViewForRepresentedObject):
Improve style.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (226346 => 226347)
--- trunk/Source/WebInspectorUI/ChangeLog 2018-01-03 02:34:18 UTC (rev 226346)
+++ trunk/Source/WebInspectorUI/ChangeLog 2018-01-03 02:52:04 UTC (rev 226347)
@@ -1 +1,21 @@
+2018-01-02 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Clicking source location link in Console unexpectedly jumps to Network tab
+ https://bugs.webkit.org/show_bug.cgi?id=181229
+ <rdar://problem/36075219>
+
+ Reviewed by Matt Baker.
+
+ * UserInterface/Base/Main.js:
+ Cleanup linkifyURLAsNode. Ignore Search tab in generic handlePossibleLinkClick
+ when not already in the Search tab.
+
+ * UserInterface/Views/CallFrameView.js:
+ (WI.CallFrameView):
+ Ignore Search and Network tab in CallFrame links.
+
+ * UserInterface/Views/TabBrowser.js:
+ (WI.TabBrowser.prototype.bestTabContentViewForRepresentedObject):
+ Improve style.
+
== Rolled over to ChangeLog-2018-01-01 ==
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (226346 => 226347)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2018-01-03 02:34:18 UTC (rev 226346)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2018-01-03 02:52:04 UTC (rev 226347)
@@ -775,7 +775,7 @@
WI.handlePossibleLinkClick = function(event, frame, options = {})
{
- var anchorElement = event.target.enclosingNodeOrSelfWithNodeName("a");
+ let anchorElement = event.target.enclosingNodeOrSelfWithNodeName("a");
if (!anchorElement || !anchorElement.href)
return false;
@@ -788,7 +788,10 @@
event.preventDefault();
event.stopPropagation();
- this.openURL(anchorElement.href, frame, Object.shallowMerge(options, {lineNumber: anchorElement.lineNumber}));
+ this.openURL(anchorElement.href, frame, Object.shallowMerge(options, {
+ lineNumber: anchorElement.lineNumber,
+ ignoreSearchTab: !WI.isShowingSearchTab(),
+ }));
return true;
};
@@ -981,6 +984,11 @@
return this.tabBrowser.selectedTabContentView instanceof WI.NetworkTabContentView;
};
+WI.isShowingSearchTab = function()
+{
+ return this.tabBrowser.selectedTabContentView instanceof WI.SearchTabContentView;
+};
+
WI.showTimelineTab = function()
{
var tabContentView = this.tabBrowser.bestTabContentViewForClass(WI.TimelineTabContentView);
@@ -2359,20 +2367,13 @@
return sourceCode || null;
};
-WI.linkifyURLAsNode = function(url, linkText, classes)
+WI.linkifyURLAsNode = function(url, linkText, className)
{
- if (!linkText)
- linkText = url;
-
- classes = classes ? classes + " " : "";
-
- var a = document.createElement("a");
+ let a = document.createElement("a");
a.href = ""
- a.className = classes;
-
- a.textContent = linkText;
+ a.className = className || "";
+ a.textContent = linkText || url;
a.style.maxWidth = "100%";
-
return a;
};
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.js (226346 => 226347)
--- trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.js 2018-01-03 02:34:18 UTC (rev 226346)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.js 2018-01-03 02:52:04 UTC (rev 226347)
@@ -37,7 +37,10 @@
var sourceCodeLocation = callFrame.sourceCodeLocation;
if (sourceCodeLocation) {
- WI.linkifyElement(callFrameElement, sourceCodeLocation);
+ WI.linkifyElement(callFrameElement, sourceCodeLocation, {
+ ignoreNetworkTab: true,
+ ignoreSearchTab: true,
+ });
var linkElement = document.createElement("a");
linkElement.classList.add("source-link");
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js (226346 => 226347)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js 2018-01-03 02:34:18 UTC (rev 226346)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js 2018-01-03 02:52:04 UTC (rev 226347)
@@ -122,16 +122,13 @@
{
console.assert(!this.selectedTabContentView || this.selectedTabContentView === this._recentTabContentViews[0]);
- for (var tabContentView of this._recentTabContentViews) {
+ for (let tabContentView of this._recentTabContentViews) {
if (options.ignoreSearchTab && tabContentView instanceof WI.SearchTabContentView)
continue;
-
if (options.ignoreNetworkTab && tabContentView instanceof WI.NetworkTabContentView)
continue;
-
if (options.ignoreResourcesTab && tabContentView instanceof WI.ResourcesTabContentView)
continue;
-
if (options.ignoreDebuggerTab && tabContentView instanceof WI.DebuggerTabContentView)
continue;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
