Changeset 246279 in webkit

Timestamp:

Jun 10, 2019 2:13:55 PM (5 years ago)

Author:

Nikita Vasilyev

Message:

REGRESSION(r244268): Web Inspector: Styles: navigating from Computed to Styles doesn't work
​https://bugs.webkit.org/show_bug.cgi?id=198508
<rdar://problem/51375503>

Reviewed by Matt Baker.

It didn't work because the detached sidebar panel tried to access its parent view (this.parentSidebar).

• UserInterface/Views/ComputedStyleDetailsSidebarPanel.js:

(WI.ComputedStyleDetailsSidebarPanel.prototype.computedStyleDetailsPanelShowProperty): Added.
(WI.ComputedStyleDetailsSidebarPanel):

• UserInterface/Views/GeneralStyleDetailsSidebarPanel.js:

(WI.GeneralStyleDetailsSidebarPanel.prototype.computedStyleDetailsPanelShowProperty): Deleted.
Move computedStyleDetailsPanelShowProperty to ComputedStyleDetailsSidebarPanel since it's the only
panel where it's needed.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/ComputedStyleDetailsSidebarPanel.js (modified) (1 diff)
• UserInterface/Views/GeneralStyleDetailsSidebarPanel.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-06-10  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        REGRESSION(r244268): Web Inspector: Styles: navigating from Computed to Styles doesn't work
+        https://bugs.webkit.org/show_bug.cgi?id=198508
+        <rdar://problem/51375503>
+
+        Reviewed by Matt Baker.
+
+        It didn't work because the detached sidebar panel tried to access its parent view (this.parentSidebar).
+
+        * UserInterface/Views/ComputedStyleDetailsSidebarPanel.js:
+        (WI.ComputedStyleDetailsSidebarPanel.prototype.computedStyleDetailsPanelShowProperty): Added.
+        (WI.ComputedStyleDetailsSidebarPanel):
+        * UserInterface/Views/GeneralStyleDetailsSidebarPanel.js:
+        (WI.GeneralStyleDetailsSidebarPanel.prototype.computedStyleDetailsPanelShowProperty): Deleted.
+        Move computedStyleDetailsPanelShowProperty to ComputedStyleDetailsSidebarPanel since it's the only
+        panel where it's needed.
+
 2019-06-10  Alexey Shvayka  <shvaikalesh@gmail.com>
 

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

@@ -30 +30 @@
         super("style-computed", WI.UIString("Computed"), WI.ComputedStyleDetailsPanel);
     }
+
+    // ComputedStyleDetailsPanel delegate
+
+    computedStyleDetailsPanelShowProperty(property)
+    {
+        let styleRulesPanel = this.parentSidebar.sidebarPanels.find((panel) => panel instanceof WI.RulesStyleDetailsSidebarPanel);
+        console.assert(styleRulesPanel, "Styles panel is missing.");
+        if (!styleRulesPanel)
+            return;
+
+        this.parentSidebar.selectedSidebarPanel = styleRulesPanel;
+        styleRulesPanel.panel.scrollToSectionAndHighlightProperty(property);
+    }
 };

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

@@ -68 +68 @@
     }
 
-    computedStyleDetailsPanelShowProperty(property)
-    {
-        this.parentSidebar.selectedSidebarPanel = "style-rules";
-
-        let styleRulesPanel = null;
-        for (let sidebarPanel of this.parentSidebar.sidebarPanels) {
-            if (!(sidebarPanel instanceof WI.RulesStyleDetailsSidebarPanel))
-                continue;
-
-            styleRulesPanel = sidebarPanel;
-            break;
-        }
-
-        console.assert(styleRulesPanel, "Styles panel is missing.");
-        styleRulesPanel.panel.scrollToSectionAndHighlightProperty(property);
-    }
-
     // StyleDetailsPanel delegate