Changeset 137292 in webkit

Timestamp:

Dec 11, 2012, 4:45:14 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: follow up to r136974: do not process shortcuts while editing
​https://bugs.webkit.org/show_bug.cgi?id=104440

Reviewed by Alexander Pavlov.

Currently, typing H while editing node results in corresponding shortcut processing.

• inspector/front-end/ElementsTreeOutline.js:

(WebInspector.ElementsTreeOutline):
(WebInspector.ElementsTreeOutline.prototype.handleShortcut):
(WebInspector.ElementsTreeElement.prototype.onenter):
(WebInspector.ElementsTreeElement.prototype._startEditingAttribute):
(WebInspector.ElementsTreeElement.prototype.dispose):
(WebInspector.ElementsTreeElement.prototype._startEditingAsHTML):
(WebInspector.ElementsTreeElement.prototype._editingCancelled):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ElementsTreeOutline.js (modified) (10 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-11  Pavel Feldman  <pfeldman@chromium.org>
+
+        Web Inspector: follow up to r136974: do not process shortcuts while editing
+        https://bugs.webkit.org/show_bug.cgi?id=104440
+
+        Reviewed by Alexander Pavlov.
+
+        Currently, typing H while editing node results in corresponding shortcut processing.
+
+        * inspector/front-end/ElementsTreeOutline.js:
+        (WebInspector.ElementsTreeOutline):
+        (WebInspector.ElementsTreeOutline.prototype.handleShortcut):
+        (WebInspector.ElementsTreeElement.prototype.onenter):
+        (WebInspector.ElementsTreeElement.prototype._startEditingAttribute):
+        (WebInspector.ElementsTreeElement.prototype.dispose):
+        (WebInspector.ElementsTreeElement.prototype._startEditingAsHTML):
+        (WebInspector.ElementsTreeElement.prototype._editingCancelled):
+
 2012-12-11  Ken Kania  <kkania@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/ElementsTreeOutline.js

@@ -58 +58 @@
     this._selectDOMNode = null;
     this._eventSupport = new WebInspector.Object();
-    this._editing = false;
 
     this._visible = false;
@@ -167 +166 @@
     },
 
-    get editing()
-    {
-        return this._editing;
-    },
-
     update: function()
     {
@@ -560 +554 @@
         }
 
-        if (event.keyCode === WebInspector.KeyboardShortcut.Keys.H.code) {
+        if (!treeElement._editing && event.keyCode === WebInspector.KeyboardShortcut.Keys.H.code) {
             WebInspector.cssModel.toggleInlineVisibility(node.id);
             return;
@@ -1089 +1083 @@
         // On Enter or Return start editing the first attribute
         // or create a new attribute on the selected element.
-        if (this.treeOutline.editing)
+        if (this._editing)
             return false;
 
@@ -1320 +1314 @@
 
         config.customFinishHandler = handleKeyDownEvents.bind(this);
-        
+
         this._editing = WebInspector.startEditing(attribute, config);
 
@@ -1440 +1434 @@
         function dispose()
         {
-            this._editing = false;
+            delete this._editing;
 
             // Remove editor.
@@ -1466 +1460 @@
     _attributeEditingCommitted: function(element, newText, oldText, attributeName, moveDirection)
     {
-        this._editing = false;
+        delete this._editing;
 
         var treeOutline = this.treeOutline;
@@ -1529 +1523 @@
     _tagNameEditingCommitted: function(element, newText, oldText, tagName, moveDirection)
     {
-        this._editing = false;
+        delete this._editing;
         var self = this;
 
@@ -1585 +1579 @@
     _textNodeEditingCommitted: function(textNode, element, newText)
     {
-        this._editing = false;
+        delete this._editing;
 
         function callback()
@@ -1600 +1594 @@
     _editingCancelled: function(element, context)
     {
-        this._editing = false;
+        delete this._editing;
 
         // Need to restore attributes structure.