Changeset 162931 in webkit

Timestamp:

Jan 28, 2014, 7:40:29 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: In a DataGrid, store value of columnIdentifier to DOM node representing a cell
​https://bugs.webkit.org/show_bug.cgi?id=127613

Patch by Diego Pino Garcia <Diego Pino Garcia> on 2014-01-28
Reviewed by Timothy Hatcher.

• UserInterface/DOMStorageContentView.js:

(WebInspector.DOMStorageContentView.prototype._editingCallback):

• UserInterface/DataGrid.js:

(WebInspector.DataGrid):
(WebInspector.DataGrid.prototype._keyDown):
(WebInspector.DataGrid.prototype._contextMenuInDataTable):
(WebInspector.DataGridNode.prototype.createCell):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/DOMStorageContentView.js (modified) (1 diff)
• UserInterface/DataGrid.js (modified) (5 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2014-01-28  Diego Pino Garcia  <dpino@igalia.com>
+
+        Web Inspector: In a DataGrid, store value of columnIdentifier to DOM node representing a cell
+        https://bugs.webkit.org/show_bug.cgi?id=127613
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/DOMStorageContentView.js:
+        (WebInspector.DOMStorageContentView.prototype._editingCallback):
+        * UserInterface/DataGrid.js:
+        (WebInspector.DataGrid):
+        (WebInspector.DataGrid.prototype._keyDown):
+        (WebInspector.DataGrid.prototype._contextMenuInDataTable):
+        (WebInspector.DataGridNode.prototype.createCell):
+
 2014-01-27  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/DOMStorageContentView.js

@@ -216 +216 @@
     {
         var domStorage = this.representedObject;
-        if (columnIdentifier === 0) {
+        if (columnIdentifier === "0") {
             if (oldText)
                 domStorage.removeItem(oldText);

trunk/Source/WebInspectorUI/UserInterface/DataGrid.js

@@ -154 +154 @@
         var td = document.createElement("td");
         td.className = columnIdentifier + "-column";
+        td.__columnIdentifier = columnIdentifier;
         var group = this.groups[columnIdentifier];
         if (group)
@@ -344 +345 @@
         // Not needed yet since only editable DataGrid is DOM Storage, which is Key - Value.
 
-        // FIXME: Better way to do this than regular expressions?
-        var columnIdentifier = parseInt(element.className.match(/\b(\d+)-column\b/)[1], 10);
+        var columnIdentifier = element.__columnIdentifier;
 
         var textBeforeEditing = this._editingNode.data[columnIdentifier] || "";
@@ -902 +902 @@
             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]);
             }
@@ -1138 +1136 @@
                 else {
                     var element = event.target.enclosingNodeOrSelfWithNodeName("td");
-                    var columnIdentifier = parseInt(element.className.match(/\b(\d+)-column\b/)[1], 10);
+                    var columnIdentifier = element.__columnIdentifier;
                     var columnTitle = this.dataGrid.columns[columnIdentifier].title;
                     contextMenu.appendItem(WebInspector.UIString("Edit “%s”").format(columnTitle), this._startEditing.bind(this, event.target));
@@ -1519 +1517 @@
         var cell = document.createElement("td");
         cell.className = columnIdentifier + "-column";
+        cell.__columnIdentifier = columnIdentifier;
 
         var alignment = this.dataGrid.aligned[columnIdentifier];