Changeset 226347 in webkit

Timestamp:

Jan 2, 2018 6:52:04 PM (6 years ago)

Author:

commit-queue@webkit.org

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 <Joseph Pecoraro> 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.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (4 diffs)
• UserInterface/Views/CallFrameView.js (modified) (1 diff)
• UserInterface/Views/TabBrowser.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2018-01-02  Joseph Pecoraro  <pecoraro@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 ==

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -776 +776 @@
 WI.handlePossibleLinkClick = function(event, frame, options = {})
 {
-    var anchorElement = event.target.enclosingNodeOrSelfWithNodeName("a");
+    let anchorElement = event.target.enclosingNodeOrSelfWithNodeName("a");
     if (!anchorElement || !anchorElement.href)
         return false;
@@ -789 +789 @@
     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;
@@ -980 +983 @@
 {
     return this.tabBrowser.selectedTabContentView instanceof WI.NetworkTabContentView;
+};
+
+WI.isShowingSearchTab = function()
+{
+    return this.tabBrowser.selectedTabContentView instanceof WI.SearchTabContentView;
 };
 
@@ -2360 +2368 @@
 };
 
-WI.linkifyURLAsNode = function(url, linkText, classes)
-{
-    if (!linkText)
-        linkText = url;
-
-    classes = classes ? classes + " " : "";
-
-    var a = document.createElement("a");
+WI.linkifyURLAsNode = function(url, linkText, className)
+{
+    let a = document.createElement("a");
     a.href = url;
-    a.className = classes;
-
-    a.textContent = linkText;
+    a.className = className || "";
+    a.textContent = linkText || url;
     a.style.maxWidth = "100%";
-
     return a;
 };

trunk/Source/WebInspectorUI/UserInterface/Views/CallFrameView.js

@@ -38 +38 @@
         var sourceCodeLocation = callFrame.sourceCodeLocation;
         if (sourceCodeLocation) {
-            WI.linkifyElement(callFrameElement, sourceCodeLocation);
+            WI.linkifyElement(callFrameElement, sourceCodeLocation, {
+                ignoreNetworkTab: true,
+                ignoreSearchTab: true,
+            });
 
             var linkElement = document.createElement("a");

trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js

@@ -123 +123 @@
         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;