Title: [246557] trunk/Source/WebInspectorUI
Revision
246557
Author
drou...@apple.com
Date
2019-06-18 12:13:40 -0700 (Tue, 18 Jun 2019)

Log Message

Web Inspector: REGRESSION: Canvas: cannot select saved recordings
https://bugs.webkit.org/show_bug.cgi?id=198953

Reviewed by Joseph Pecoraro.

* UserInterface/Views/TreeElement.js:
(WI.TreeElement.treeElementToggled):
Don't early return if the `TreeElement` isn't `selectable` as the owner `TreeOutline` may
want to dispatch an event that it was clicked.

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (246556 => 246557)


--- trunk/Source/WebInspectorUI/ChangeLog	2019-06-18 19:13:06 UTC (rev 246556)
+++ trunk/Source/WebInspectorUI/ChangeLog	2019-06-18 19:13:40 UTC (rev 246557)
@@ -1,5 +1,17 @@
 2019-06-18  Devin Rousso  <drou...@apple.com>
 
+        Web Inspector: REGRESSION: Canvas: cannot select saved recordings
+        https://bugs.webkit.org/show_bug.cgi?id=198953
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/TreeElement.js:
+        (WI.TreeElement.treeElementToggled):
+        Don't early return if the `TreeElement` isn't `selectable` as the owner `TreeOutline` may
+        want to dispatch an event that it was clicked.
+
+2019-06-18  Devin Rousso  <drou...@apple.com>
+
         Web Inspector: Canvas: the initial state should be selected when processing a new/imported recording if the navigation sidebar is collapsed
         https://bugs.webkit.org/show_bug.cgi?id=198952
 

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeElement.js (246556 => 246557)


--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeElement.js	2019-06-18 19:13:06 UTC (rev 246556)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeElement.js	2019-06-18 19:13:40 UTC (rev 246557)
@@ -308,22 +308,20 @@
             return;
 
         let toggleOnClick = treeElement.toggleOnClick && !treeElement.selectable;
-        let isInTriangle = treeElement.isEventWithinDisclosureTriangle(event);
-        if (!toggleOnClick && !isInTriangle)
-            return;
-
-        if (treeElement.expanded) {
-            if (event.altKey)
-                treeElement.collapseRecursively();
-            else
-                treeElement.collapse();
-        } else {
-            if (event.altKey)
-                treeElement.expandRecursively();
-            else
-                treeElement.expand();
+        if (toggleOnClick || treeElement.isEventWithinDisclosureTriangle(event)) {
+            if (treeElement.expanded) {
+                if (event.altKey)
+                    treeElement.collapseRecursively();
+                else
+                    treeElement.collapse();
+            } else {
+                if (event.altKey)
+                    treeElement.expandRecursively();
+                else
+                    treeElement.expand();
+            }
+            event.stopPropagation();
         }
-        event.stopPropagation();
 
         if (!treeElement.treeOutline.selectable)
             treeElement.treeOutline.dispatchEventToListeners(WI.TreeOutline.Event.ElementClicked, {treeElement});
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to