commit 4e8d95dbf332de05629709a8156d4ebe89155dbd
author drousso@apple.com <drousso@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri May 10 00:15:13 2019 +0000
committer drousso@apple.com <drousso@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri May 10 00:15:13 2019 +0000
tree f68f037c5d8fc3d1a90b2a9928a06249d5efbaa7
parent 81c1fab2776962a27ff49cff096578922d120785

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):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@245166 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebInspectorUI/ChangeLog

diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
index d2b0bc1..c7b04d0 100644
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -1,5 +1,15 @@
 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>
+
         Web Inspector: Uncaught Exception: null is not an object (evaluating 'url.startsWith')
         https://bugs.webkit.org/show_bug.cgi?id=196662
         <rdar://problem/49659633>

Source/WebInspectorUI/UserInterface/Views/TreeElement.js

diff --git a/Source/WebInspectorUI/UserInterface/Views/TreeElement.js b/Source/WebInspectorUI/UserInterface/Views/TreeElement.js
index adf5904..63c27b8 100644
--- a/Source/WebInspectorUI/UserInterface/Views/TreeElement.js
+++ b/Source/WebInspectorUI/UserInterface/Views/TreeElement.js
@@ -300,14 +300,12 @@
     static treeElementToggled(event)
     {
         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});
+        if (!treeElement)
             return;
-        }
 
         let toggleOnClick = treeElement.toggleOnClick && !treeElement.selectable;
         let isInTriangle = treeElement.isEventWithinDisclosureTriangle(event);
@@ -326,6 +324,9 @@
                 treeElement.expand();
         }
         event.stopPropagation();
+
+        if (!treeElement.treeOutline.selectable)
+            treeElement.treeOutline.dispatchEventToListeners(WI.TreeOutline.Event.ElementClicked, {treeElement});
     }
 
     static treeElementDoubleClicked(event)