<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[162931] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162931">162931</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-28 07:40:29 -0800 (Tue, 28 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <dpino@igalia.com> 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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceDOMStorageContentViewjs">trunk/Source/WebInspectorUI/UserInterface/DOMStorageContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceDataGridjs">trunk/Source/WebInspectorUI/UserInterface/DataGrid.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (162930 => 162931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-01-28 15:08:31 UTC (rev 162930)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-01-28 15:40:29 UTC (rev 162931)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-01-27 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Feature Check all Protocol Generated Interfaces to get JSContext Inspection working
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceDOMStorageContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/DOMStorageContentView.js (162930 => 162931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/DOMStorageContentView.js 2014-01-28 15:08:31 UTC (rev 162930)
+++ trunk/Source/WebInspectorUI/UserInterface/DOMStorageContentView.js 2014-01-28 15:40:29 UTC (rev 162931)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> _editingCallback: function(editingNode, columnIdentifier, oldText, newText)
</span><span class="cx"> {
</span><span class="cx"> var domStorage = this.representedObject;
</span><del>- if (columnIdentifier === 0) {
</del><ins>+ if (columnIdentifier === "0") {
</ins><span class="cx"> if (oldText)
</span><span class="cx"> domStorage.removeItem(oldText);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/DataGrid.js (162930 => 162931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/DataGrid.js 2014-01-28 15:08:31 UTC (rev 162930)
+++ trunk/Source/WebInspectorUI/UserInterface/DataGrid.js 2014-01-28 15:40:29 UTC (rev 162931)
</span><span class="lines">@@ -153,6 +153,7 @@
</span><span class="cx"> var column = columns[columnIdentifier];
</span><span class="cx"> var td = document.createElement("td");
</span><span class="cx"> td.className = columnIdentifier + "-column";
</span><ins>+ td.__columnIdentifier = columnIdentifier;
</ins><span class="cx"> var group = this.groups[columnIdentifier];
</span><span class="cx"> if (group)
</span><span class="cx"> td.classList.add("column-group-" + group);
</span><span class="lines">@@ -343,8 +344,7 @@
</span><span class="cx"> // FIXME: We need more column identifiers here throughout this function.
</span><span class="cx"> // Not needed yet since only editable DataGrid is DOM Storage, which is Key - Value.
</span><span class="cx">
</span><del>- // FIXME: Better way to do this than regular expressions?
- var columnIdentifier = parseInt(element.className.match(/\b(\d+)-column\b/)[1], 10);
</del><ins>+ var columnIdentifier = element.__columnIdentifier;
</ins><span class="cx">
</span><span class="cx"> var textBeforeEditing = this._editingNode.data[columnIdentifier] || "";
</span><span class="cx"> var currentEditingNode = this._editingNode;
</span><span class="lines">@@ -901,8 +901,6 @@
</span><span class="cx"> } else if (isEnterKey(event)) {
</span><span class="cx"> if (this._editCallback) {
</span><span class="cx"> handled = true;
</span><del>- // The first child of the selected element is the <td class="0-column">,
- // and that's what we want to edit.
</del><span class="cx"> this._startEditing(this.selectedNode._element.children[0]);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1137,7 +1135,7 @@
</span><span class="cx"> contextMenu.appendItem(WebInspector.UIString("Add New"), this._startEditing.bind(this, event.target));
</span><span class="cx"> else {
</span><span class="cx"> var element = event.target.enclosingNodeOrSelfWithNodeName("td");
</span><del>- var columnIdentifier = parseInt(element.className.match(/\b(\d+)-column\b/)[1], 10);
</del><ins>+ var columnIdentifier = element.__columnIdentifier;
</ins><span class="cx"> var columnTitle = this.dataGrid.columns[columnIdentifier].title;
</span><span class="cx"> contextMenu.appendItem(WebInspector.UIString("Edit “%s”").format(columnTitle), this._startEditing.bind(this, event.target));
</span><span class="cx"> }
</span><span class="lines">@@ -1518,6 +1516,7 @@
</span><span class="cx"> {
</span><span class="cx"> var cell = document.createElement("td");
</span><span class="cx"> cell.className = columnIdentifier + "-column";
</span><ins>+ cell.__columnIdentifier = columnIdentifier;
</ins><span class="cx">
</span><span class="cx"> var alignment = this.dataGrid.aligned[columnIdentifier];
</span><span class="cx"> if (alignment)
</span></span></pre>
</div>
</div>
</body>
</html>