Title: [158953] branches/safari-537.73-branch/Source/WebInspectorUI
- Revision
- 158953
- Author
- [email protected]
- Date
- 2013-11-08 14:01:03 -0800 (Fri, 08 Nov 2013)
Log Message
Merged r157459. <rdar://problem/15411420>
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog (158952 => 158953)
--- branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog 2013-11-08 21:55:33 UTC (rev 158952)
+++ branches/safari-537.73-branch/Source/WebInspectorUI/ChangeLog 2013-11-08 22:01:03 UTC (rev 158953)
@@ -1,3 +1,21 @@
+2013-11-08 Lucas Forschler <[email protected]>
+
+ Merge r157459
+
+ 2013-10-15 Antoine Quint <[email protected]>
+
+ Web Inspector: can't select text inside a text node
+ https://bugs.webkit.org/show_bug.cgi?id=122828
+
+ Reviewed by Timothy Hatcher.
+
+ Cancel the default user interaction when a drag action starts if the
+ element is being edited.
+
+ * UserInterface/DOMTreeElement.js:
+ (WebInspector.DOMTreeElement.prototype.onattach):
+ (WebInspector.DOMTreeElement.prototype.handleEvent):
+
2013-11-06 Lucas Forschler <[email protected]>
Merge rr157966
Modified: branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/DOMTreeElement.js (158952 => 158953)
--- branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/DOMTreeElement.js 2013-11-08 21:55:33 UTC (rev 158952)
+++ branches/safari-537.73-branch/Source/WebInspectorUI/UserInterface/DOMTreeElement.js 2013-11-08 22:01:03 UTC (rev 158953)
@@ -256,6 +256,7 @@
this.updateTitle();
this.listItemElement.draggable = true;
+ this.listItemElement.addEventListener("dragstart", this);
},
onpopulate: function()
@@ -1301,6 +1302,12 @@
this._highlightResult = [];
highlightSearchResults(this.listItemElement, matchRanges, this._highlightResult);
+ },
+
+ handleEvent: function(event)
+ {
+ if (event.type === "dragstart" && this._editing)
+ event.preventDefault();
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
