Title: [193232] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193232
- Author
- [email protected]
- Date
- 2015-12-03 11:00:12 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r190286. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193231 => 193232)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:00:06 UTC (rev 193231)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:00:12 UTC (rev 193232)
@@ -1,5 +1,22 @@
2015-12-02 Timothy Hatcher <[email protected]>
+ Merge r190286. rdar://problem/23221163
+
+ 2015-09-28 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Hitting ESC while editing element tag name leaves element in bad state
+ https://bugs.webkit.org/show_bug.cgi?id=149506
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/DOMTreeElement.js:
+ (WebInspector.DOMTreeElement.prototype._startEditingTagName.editingCancelled):
+ (WebInspector.DOMTreeElement.prototype._startEditingTagName):
+ When cancelling editing of a tag name, revert any changes we had
+ been making to the closing tag name.
+
+2015-12-02 Timothy Hatcher <[email protected]>
+
Merge r190285. rdar://problem/23221163
2015-09-28 João Oliveira <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js (193231 => 193232)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2015-12-03 19:00:06 UTC (rev 193231)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2015-12-03 19:00:12 UTC (rev 193232)
@@ -808,6 +808,7 @@
return true;
var closingTagElement = this._distinctClosingTagElement();
+ var originalClosingTagTextContent = closingTagElement ? closingTagElement.textContent : "";
function keyupListener(event)
{
@@ -823,6 +824,9 @@
function editingCancelled()
{
+ if (closingTagElement)
+ closingTagElement.textContent = originalClosingTagTextContent;
+
tagNameElement.removeEventListener("keyup", keyupListener, false);
this._editingCancelled.apply(this, arguments);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
