Title: [241076] branches/safari-607-branch/Source/WebInspectorUI
- Revision
- 241076
- Author
- alanc...@apple.com
- Date
- 2019-02-06 14:17:16 -0800 (Wed, 06 Feb 2019)
Log Message
Cherry-pick r240819. rdar://problem/47774546
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 Devin Rousso.
* 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.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240819 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebInspectorUI/ChangeLog (241075 => 241076)
--- branches/safari-607-branch/Source/WebInspectorUI/ChangeLog 2019-02-06 22:17:13 UTC (rev 241075)
+++ branches/safari-607-branch/Source/WebInspectorUI/ChangeLog 2019-02-06 22:17:16 UTC (rev 241076)
@@ -1,5 +1,54 @@
2019-02-05 Alan Coon <alanc...@apple.com>
+ Cherry-pick r240819. rdar://problem/47774546
+
+ 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 Devin Rousso.
+
+ * 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.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240819 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-31 Matt Baker <mattba...@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 Devin Rousso.
+
+ * 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-02-05 Alan Coon <alanc...@apple.com>
+
Cherry-pick r240639. rdar://problem/47774511
Web Inspector: Elements tab should toggle visibility for all selected nodes
Modified: branches/safari-607-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js (241075 => 241076)
--- branches/safari-607-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2019-02-06 22:17:13 UTC (rev 241075)
+++ branches/safari-607-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2019-02-06 22:17:16 UTC (rev 241076)
@@ -646,8 +646,10 @@
return false;
// Prevent selecting the nearest word on double click.
- if (event.detail >= 2)
+ if (event.detail >= 2) {
+ event.preventDefault();
return false;
+ }
return true;
}
Modified: branches/safari-607-branch/Source/WebInspectorUI/UserInterface/Views/TreeElement.js (241075 => 241076)
--- branches/safari-607-branch/Source/WebInspectorUI/UserInterface/Views/TreeElement.js 2019-02-06 22:17:13 UTC (rev 241075)
+++ branches/safari-607-branch/Source/WebInspectorUI/UserInterface/Views/TreeElement.js 2019-02-06 22:17:16 UTC (rev 241076)
@@ -490,14 +490,6 @@
return true;
}
- selectOnMouseDown(event)
- {
- if (!this.treeOutline.selectable)
- return;
-
- this.select(false, true);
- }
-
select(omitFocus, selectedByUser, suppressNotification)
{
if (!this.treeOutline || !this.selectable)
Modified: branches/safari-607-branch/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js (241075 => 241076)
--- branches/safari-607-branch/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js 2019-02-06 22:17:13 UTC (rev 241075)
+++ branches/safari-607-branch/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js 2019-02-06 22:17:16 UTC (rev 241076)
@@ -1012,10 +1012,8 @@
return;
}
- if (!treeElement.canSelectOnMouseDown(event)) {
- event.preventDefault();
+ if (!treeElement.canSelectOnMouseDown(event))
return;
- }
let index = this._indexOfTreeElement(treeElement);
if (isNaN(index))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
