Attachment 359294 Details for Bug 192652 – Patch

[patch] Patch

bug-192652-20190116125100.patch (text/plain), 3.45 KB, created by Matt Baker on 2019-01-16 12:51:01 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Baker

Created: 2019-01-16 12:51:01 PST

Size: 3.45 KB

patch

obsolete

>Subversion Revision: 240043
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 52eb3229afee0e5be2edc037b985daebe49612f9..7ff59e3e3e2920dc2dd64065826b07337fb4cfac 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,25 @@
>+2019-01-16  Matt Baker  <mattbaker@apple.com>
>+
>+        REGRESSION(r?): Web Inspector: Clicking on text doesn't move text caret when editing innerHTML/tagName/attribute
>+        https://bugs.webkit.org/show_bug.cgi?id=192652
>+        <rdar://problem/46684612>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Views/DOMTreeElement.js:
>+        (WI.DOMTreeElement.prototype.canSelectOnMouseDown):
>+        Call to Event.preventDefault() should be made here instead of at the
>+        TreeOutline level.
>+
>+        * UserInterface/Views/TreeElement.js:
>+        (WI.TreeElement.prototype.selectOnMouseDown): Deleted.
>+        Remove dead code.
>+
>+        * UserInterface/Views/TreeOutline.js:
>+        (WI.TreeOutline._handleMouseDown):
>+        Do not prevent default event handling when the item cannot be selected.
>+        This matches TreeOutline behavior prior to introducing SelectionController.
>+
> 2019-01-16  Matt Baker  <mattbaker@apple.com>
> 
>         Web Inspector: Fix TreeOutline TypeError:â this._indexesForSubtree is not a function
>diff --git a/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js b/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js
>index d5d0fafe5e5fcda3ba94eaad3df385049e2c60fe..a0aef56b4cebab7e01a9613ca29d48a394225ef4 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js
>@@ -647,8 +647,10 @@ WI.DOMTreeElement = class DOMTreeElement extends WI.TreeElement
>             return false;
> 
>         // Prevent selecting the nearest word on double click.
>-        if (event.detail >= 2)
>+        if (event.detail >= 2) {
>+            event.preventDefault();
>             return false;
>+        }
> 
>         return true;
>     }
>diff --git a/Source/WebInspectorUI/UserInterface/Views/TreeElement.js b/Source/WebInspectorUI/UserInterface/Views/TreeElement.js
>index 7af88394cc1b906df54e00c09d29a12aab3b1c47..d3b892943527766129b244affb9a969e0026a02a 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/TreeElement.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/TreeElement.js
>@@ -490,14 +490,6 @@ WI.TreeElement = class TreeElement extends WI.Object
>         return true;
>     }
> 
>-    selectOnMouseDown(event)
>-    {
>-        if (!this.treeOutline.selectable)
>-            return;
>-
>-        this.select(false, true);
>-    }
>-
>     select(omitFocus, selectedByUser, suppressNotification)
>     {
>         if (!this.treeOutline || !this.selectable)
>diff --git a/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js b/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js
>index a47e60b89af6e0def5b868a6447905f5ab29ef9d..37c3ebdc715d5a12f3a3f281fff9e8ed2335e4f2 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js
>@@ -1012,10 +1012,8 @@ WI.TreeOutline = class TreeOutline extends WI.Object
>             return;
>         }
> 
>-        if (!treeElement.canSelectOnMouseDown(event)) {
>-            event.preventDefault();
>+        if (!treeElement.canSelectOnMouseDown(event))
>             return;
>-        }
> 
>         let index = this._indexOfTreeElement(treeElement);
>         if (isNaN(index))

Actions: View | Formatted Diff | Diff

Attachments on bug 192652: 357202 | 359294 | 359298 | 359804 | 360165