Changeset 51119 in webkit

Timestamp:

Nov 18, 2009 10:12:07 AM (14 years ago)

Author:

bweinstein@apple.com

Message:

Fixes <​http://webkit.org/b/31606>.
Web Inspector: Enter/Return key should enter edit mode for Editable Fields.

Reviewed by Pavel Feldman.

This implements Enter starting editing mode in an editable DataGrid. If the
DataGrid is editable and the user hits return, startEditing the first child
of the selected node. Also refactored some editing functions to take an
event target instead of the event itself, because the functions only needed
the target. Lastly, added had return in editing mode stop propogation, because
when enter was hit to confirm text, it would propagate back to the datagrid
and try to start editing again.

• inspector/front-end/DataGrid.js:

(WebInspector.DataGrid.prototype._ondblclick):
(WebInspector.DataGrid.prototype._startEditing):
(WebInspector.DataGrid.prototype.handleKeyEvent):
(WebInspector.DataGrid.prototype.dataGridNodeFromEvent):
(WebInspector.DataGrid.prototype._mouseDownInDataTable):
(WebInspector.DataGrid.prototype._clickInDataTable):

• inspector/front-end/inspector.js:

(WebInspector.startEditing.element.handleKeyEvent):
(WebInspector.startEditing):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/DataGrid.js (modified) (6 diffs)
• inspector/front-end/inspector.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-17  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Pavel Feldman.
+
+        Fixes <http://webkit.org/b/31606>.
+        Web Inspector: Enter/Return key should enter edit mode for Editable Fields.
+        
+        This implements Enter starting editing mode in an editable DataGrid. If the
+        DataGrid is editable and the user hits return, startEditing the first child
+        of the selected node. Also refactored some editing functions to take an 
+        event target instead of the event itself, because the functions only needed
+        the target. Lastly, added had return in editing mode stop propogation, because
+        when enter was hit to confirm text, it would propagate back to the datagrid
+        and try to start editing again.
+
+        * inspector/front-end/DataGrid.js:
+        (WebInspector.DataGrid.prototype._ondblclick):
+        (WebInspector.DataGrid.prototype._startEditing):
+        (WebInspector.DataGrid.prototype.handleKeyEvent):
+        (WebInspector.DataGrid.prototype.dataGridNodeFromEvent):
+        (WebInspector.DataGrid.prototype._mouseDownInDataTable):
+        (WebInspector.DataGrid.prototype._clickInDataTable):
+        * inspector/front-end/inspector.js:
+        (WebInspector.startEditing.element.handleKeyEvent):
+        (WebInspector.startEditing):
+
 2009-11-18  Ben Murdoch  <benm@google.com>
 

trunk/WebCore/inspector/front-end/DataGrid.js

@@ -143 +143 @@
             return;
 
-        this._startEditing(event);
+        this._startEditing(event.target);
     },
 
@@ -157 +157 @@
     },
 
-    _startEditing: function(event)
-    {
-        var element = event.target.enclosingNodeOrSelfWithNodeName("td");
+    _startEditing: function(target)
+    {
+        var element = target.enclosingNodeOrSelfWithNodeName("td");
         if (!element)
             return;
 
-        this._editingNode = this.dataGridNodeFromEvent(event);
+        this._editingNode = this.dataGridNodeFromNode(target);
         if (!this._editingNode) {
             if (!this.creationNode)
@@ -521 +521 @@
                 this._deleteCallback(this.selectedNode);
             }
+        } else if (isEnterKey(event)) {
+            if (this._editCallback) {
+                handled = true;
+                // The first child of the selected element is the <td class="0-column">,
+                // and that's what we want to edit.
+                this._startEditing(this.selectedNode._element.children[0]);
+            }
         }
 
@@ -551 +558 @@
     },
 
-    dataGridNodeFromEvent: function(event)
-    {
-        var rowElement = event.target.enclosingNodeOrSelfWithNodeName("tr");
+    dataGridNodeFromNode: function(target)
+    {
+        var rowElement = target.enclosingNodeOrSelfWithNodeName("tr");
         return rowElement._dataGridNode;
     },
@@ -598 +605 @@
     _mouseDownInDataTable: function(event)
     {
-        var gridNode = this.dataGridNodeFromEvent(event);
+        var gridNode = this.dataGridNodeFromNode(event.target);
         if (!gridNode || !gridNode.selectable)
             return;
@@ -616 +623 @@
     _clickInDataTable: function(event)
     {
-        var gridNode = this.dataGridNodeFromEvent(event);
+        var gridNode = this.dataGridNodeFromNode(event.target);
         if (!gridNode || !gridNode.hasChildren)
             return;

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

@@ -1681 +1681 @@
             editingCommitted.call(element);
             event.preventDefault();
+            event.stopPropagation();
+            event.handled = true;
         } else if (event.keyCode === 27) { // Escape key
             editingCancelled.call(element);