Changeset 245166 in webkit

Timestamp:

May 9, 2019 5:15:13 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: REGRESSION: unable to expand/collapse non-selectable WI.TreeOutline
​https://bugs.webkit.org/show_bug.cgi?id=197591

Reviewed by Timothy Hatcher.

• UserInterface/Views/TreeElement.js:

(WI.TreeElement.treeElementToggled):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/TreeElement.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-05-09  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: REGRESSION: unable to expand/collapse non-selectable WI.TreeOutline
+        https://bugs.webkit.org/show_bug.cgi?id=197591
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/TreeElement.js:
+        (WI.TreeElement.treeElementToggled):
+
 2019-05-09  Devin Rousso  <drousso@apple.com>
 

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

@@ -301 +301 @@
     {
         let element = event.currentTarget;
-        if (!element || !element.treeElement)
+        if (!element)
             return;
 
         let treeElement = element.treeElement;
-        if (!treeElement.treeOutline.selectable) {
-            treeElement.treeOutline.dispatchEventToListeners(WI.TreeOutline.Event.ElementClicked, {treeElement});
-            return;
-        }
+        if (!treeElement)
+            return;
 
         let toggleOnClick = treeElement.toggleOnClick && !treeElement.selectable;
@@ -327 +325 @@
         }
         event.stopPropagation();
+
+        if (!treeElement.treeOutline.selectable)
+            treeElement.treeOutline.dispatchEventToListeners(WI.TreeOutline.Event.ElementClicked, {treeElement});
     }