Title: [145531] trunk/Source/WebCore
- Revision
- 145531
- Author
- [email protected]
- Date
- 2013-03-12 05:23:41 -0700 (Tue, 12 Mar 2013)
Log Message
Web Inspector: [Elements] Unable to undo "Edit as HTML" changes in the editor
https://bugs.webkit.org/show_bug.cgi?id=112119
Reviewed by Vsevolod Vlasov.
No new tests, a UI change.
* inspector/front-end/ElementsPanel.js:
(WebInspector.ElementsPanel.prototype.handleShortcut): Do not undo/redo DOM/CSS changes if editing DOM text.
* inspector/front-end/ElementsTreeOutline.js:
(WebInspector.ElementsTreeOutline.prototype.editing): Added.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (145530 => 145531)
--- trunk/Source/WebCore/ChangeLog 2013-03-12 12:15:21 UTC (rev 145530)
+++ trunk/Source/WebCore/ChangeLog 2013-03-12 12:23:41 UTC (rev 145531)
@@ -1,3 +1,17 @@
+2013-03-12 Alexander Pavlov <[email protected]>
+
+ Web Inspector: [Elements] Unable to undo "Edit as HTML" changes in the editor
+ https://bugs.webkit.org/show_bug.cgi?id=112119
+
+ Reviewed by Vsevolod Vlasov.
+
+ No new tests, a UI change.
+
+ * inspector/front-end/ElementsPanel.js:
+ (WebInspector.ElementsPanel.prototype.handleShortcut): Do not undo/redo DOM/CSS changes if editing DOM text.
+ * inspector/front-end/ElementsTreeOutline.js:
+ (WebInspector.ElementsTreeOutline.prototype.editing): Added.
+
2013-03-12 Andrey Lushnikov <[email protected]>
Web Inspector: [CodeMirror] there are bugs in TokenHighlight feature
Modified: trunk/Source/WebCore/inspector/front-end/ElementsPanel.js (145530 => 145531)
--- trunk/Source/WebCore/inspector/front-end/ElementsPanel.js 2013-03-12 12:15:21 UTC (rev 145530)
+++ trunk/Source/WebCore/inspector/front-end/ElementsPanel.js 2013-03-12 12:23:41 UTC (rev 145531)
@@ -1011,18 +1011,26 @@
handleShortcut: function(event)
{
- if (WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event) && !event.shiftKey && event.keyIdentifier === "U+005A") { // Z key
- WebInspector.domAgent.undo(this._updateSidebars.bind(this));
- event.handled = true;
- return;
+ function handleUndoRedo()
+ {
+ if (WebInspector.KeyboardShortcut.eventHasCtrlOrMeta(event) && !event.shiftKey && event.keyIdentifier === "U+005A") { // Z key
+ WebInspector.domAgent.undo(this._updateSidebars.bind(this));
+ event.handled = true;
+ return;
+ }
+
+ var isRedoKey = WebInspector.isMac() ? event.metaKey && event.shiftKey && event.keyIdentifier === "U+005A" : // Z key
+ event.ctrlKey && event.keyIdentifier === "U+0059"; // Y key
+ if (isRedoKey) {
+ DOMAgent.redo(this._updateSidebars.bind(this));
+ event.handled = true;
+ }
}
- var isRedoKey = WebInspector.isMac() ? event.metaKey && event.shiftKey && event.keyIdentifier === "U+005A" : // Z key
- event.ctrlKey && event.keyIdentifier === "U+0059"; // Y key
- if (isRedoKey) {
- DOMAgent.redo(this._updateSidebars.bind(this));
- event.handled = true;
- return;
+ if (!this.treeOutline.editing()) {
+ handleUndoRedo.call(this);
+ if (event.handled)
+ return;
}
this.treeOutline.handleShortcut(event);
Modified: trunk/Source/WebCore/inspector/front-end/ElementsTreeOutline.js (145530 => 145531)
--- trunk/Source/WebCore/inspector/front-end/ElementsTreeOutline.js 2013-03-12 12:15:21 UTC (rev 145530)
+++ trunk/Source/WebCore/inspector/front-end/ElementsTreeOutline.js 2013-03-12 12:23:41 UTC (rev 145531)
@@ -166,6 +166,20 @@
this._selectedNodeChanged();
},
+ /**
+ * @return {boolean}
+ */
+ editing: function()
+ {
+ var node = this.selectedDOMNode();
+ if (!node)
+ return false;
+ var treeElement = this.findTreeElement(node);
+ if (!treeElement)
+ return false;
+ return treeElement._editing || false;
+ },
+
update: function()
{
var selectedNode = this.selectedTreeElement ? this.selectedTreeElement.representedObject : null;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
