<!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>[167955] 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/167955">167955</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-04-29 13:51:47 -0700 (Tue, 29 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: DataGrid columns should be objects not Maps
https://bugs.webkit.org/show_bug.cgi?id=129383
Reviewed by Timothy Hatcher.
This reverts an earlier conversion to maps, so that column properties
(which rarely change) can be optimized.
String literals for column properties have been preserved so columns
can be easily converted into objects with methods.
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid.prototype.autoSizeColumns):
(WebInspector.DataGrid.prototype.set var):
(WebInspector.DataGrid.prototype.set if):
(WebInspector.DataGrid.prototype.insertColumn):
(WebInspector.DataGrid.prototype.removeColumn.get this):
(WebInspector.DataGrid.prototype.removeColumn):
(WebInspector.DataGrid.prototype.columnWidthsMap):
(WebInspector.DataGrid.prototype.applyColumnWidthsMap):
(WebInspector.DataGrid.prototype._collapseColumnGroupWithCell):
(WebInspector.DataGridNode.prototype.createCell.get if):
(WebInspector.DataGridNode.prototype.createCell):
(WebInspector.DataGrid.prototype.get length): Deleted.
* UserInterface/Views/ProbeSetDataGrid.js:
(WebInspector.ProbeSetDataGrid.prototype._probeExpressionChanged.get this):
(WebInspector.ProbeSetDataGrid.prototype._probeExpressionChanged):
* UserInterface/Views/TimelineDataGrid.js:
(WebInspector.TimelineDataGrid.prototype.treeElementMatchesActiveScopeFilters.scopeBar.this.columns.get string_appeared_here):
(WebInspector.TimelineDataGrid.prototype.treeElementMatchesActiveScopeFilters):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (167954 => 167955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-04-29 20:33:43 UTC (rev 167954)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-04-29 20:51:47 UTC (rev 167955)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-04-29 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: DataGrid columns should be objects not Maps
+ https://bugs.webkit.org/show_bug.cgi?id=129383
+
+ Reviewed by Timothy Hatcher.
+
+ This reverts an earlier conversion to maps, so that column properties
+ (which rarely change) can be optimized.
+
+ String literals for column properties have been preserved so columns
+ can be easily converted into objects with methods.
+
+ * UserInterface/Views/DataGrid.js:
+ (WebInspector.DataGrid.prototype.autoSizeColumns):
+ (WebInspector.DataGrid.prototype.set var):
+ (WebInspector.DataGrid.prototype.set if):
+ (WebInspector.DataGrid.prototype.insertColumn):
+ (WebInspector.DataGrid.prototype.removeColumn.get this):
+ (WebInspector.DataGrid.prototype.removeColumn):
+ (WebInspector.DataGrid.prototype.columnWidthsMap):
+ (WebInspector.DataGrid.prototype.applyColumnWidthsMap):
+ (WebInspector.DataGrid.prototype._collapseColumnGroupWithCell):
+ (WebInspector.DataGridNode.prototype.createCell.get if):
+ (WebInspector.DataGridNode.prototype.createCell):
+ (WebInspector.DataGrid.prototype.get length): Deleted.
+ * UserInterface/Views/ProbeSetDataGrid.js:
+ (WebInspector.ProbeSetDataGrid.prototype._probeExpressionChanged.get this):
+ (WebInspector.ProbeSetDataGrid.prototype._probeExpressionChanged):
+ * UserInterface/Views/TimelineDataGrid.js:
+ (WebInspector.TimelineDataGrid.prototype.treeElementMatchesActiveScopeFilters.scopeBar.this.columns.get string_appeared_here):
+ (WebInspector.TimelineDataGrid.prototype.treeElementMatchesActiveScopeFilters):
+
</ins><span class="cx"> 2014-04-25 Jonathan Wells <jonowells@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: DOM Tree debugger popover obscures dashboard
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (167954 => 167955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2014-04-29 20:33:43 UTC (rev 167954)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2014-04-29 20:51:47 UTC (rev 167955)
</span><span class="lines">@@ -121,9 +121,9 @@
</span><span class="cx">
</span><span class="cx"> for (var columnName of columnNames) {
</span><span class="cx"> var column = {};
</span><del>- column.width = columnName.length;
- column.title = columnName;
- column.sortable = true;
</del><ins>+ column["width"] = columnName.length;
+ column["title"] = columnName;
+ column["sortable"] = true;
</ins><span class="cx">
</span><span class="cx"> columnsData[columnName] = column;
</span><span class="cx"> }
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> set sortColumnIdentifier(columnIdentifier)
</span><span class="cx"> {
</span><span class="cx"> console.assert(columnIdentifier && this.columns.has(columnIdentifier));
</span><del>- console.assert(this.columns.get(columnIdentifier).has("sortable"));
</del><ins>+ console.assert("sortable" in this.columns.get(columnIdentifier));
</ins><span class="cx">
</span><span class="cx"> if (this._sortColumnIdentifier === columnIdentifier)
</span><span class="cx"> return;
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx"> var widths = {};
</span><span class="cx"> // For the first width approximation, use the character length of column titles.
</span><span class="cx"> for (var [identifier, column] of this.columns)
</span><del>- widths[identifier] = column.get("title", "").length;
</del><ins>+ widths[identifier] = (column["title"] || "").length;
</ins><span class="cx">
</span><span class="cx"> // Now approximate the width of each column as max(title, cells).
</span><span class="cx"> var children = maxDescentLevel ? this._enumerateChildren(this, [], maxDescentLevel + 1) : this.children;
</span><span class="lines">@@ -408,7 +408,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (var [identifier, column] of this.columns)
</span><del>- column.get("element").style.width = widths[identifier] + "%";
</del><ins>+ column["element"].style.width = widths[identifier] + "%";
</ins><span class="cx"> this._columnWidthsInitialized = false;
</span><span class="cx"> this.updateLayout();
</span><span class="cx"> },
</span><span class="lines">@@ -421,57 +421,55 @@
</span><span class="cx"> var listeners = new WebInspector.EventListenerSet(this, "DataGrid column DOM listeners");
</span><span class="cx">
</span><span class="cx"> // Copy configuration properties instead of keeping a reference to the passed-in object.
</span><del>- var column = new Map;
- for (var propertyName in columnData)
- column.set(propertyName, columnData[propertyName]);
</del><ins>+ var column = Object.shallowCopy(columnData);
+ column["listeners"] = listeners;
+ column["ordinal"] = insertionIndex;
+ column["columnIdentifier"] = columnIdentifier;
</ins><span class="cx">
</span><del>- column.set("listeners", listeners);
- column.set("ordinal", insertionIndex);
- column.set("columnIdentifier", columnIdentifier);
</del><span class="cx"> this.orderedColumns.splice(insertionIndex, 0, columnIdentifier);
</span><span class="cx">
</span><span class="cx"> for (var [identifier, existingColumn] of this.columns) {
</span><del>- var ordinal = existingColumn.get("ordinal");
</del><ins>+ var ordinal = existingColumn["ordinal"];
</ins><span class="cx"> if (ordinal >= insertionIndex) // Also adjust the "old" column at insertion index.
</span><del>- existingColumn.set("ordinal", ordinal + 1);
</del><ins>+ existingColumn["ordinal"] = ordinal + 1;
</ins><span class="cx"> }
</span><span class="cx"> this.columns.set(columnIdentifier, column);
</span><span class="cx">
</span><del>- if (column.has("disclosure"))
</del><ins>+ if (column["disclosure"])
</ins><span class="cx"> this.disclosureColumnIdentifier = columnIdentifier;
</span><span class="cx">
</span><span class="cx"> var headerColumnElement = document.createElement("col");
</span><del>- if (column.has("width"))
- headerColumnElement.style.width = column.get("width");
- column.set("element", headerColumnElement);
</del><ins>+ if (column["width"])
+ headerColumnElement.style.width = column["width"];
+ column["element"] = headerColumnElement;
</ins><span class="cx"> var referenceElement = this._headerTableColumnGroupElement.children[insertionIndex];
</span><span class="cx"> this._headerTableColumnGroupElement.insertBefore(headerColumnElement, referenceElement);
</span><span class="cx">
</span><span class="cx"> var headerCellElement = document.createElement("th");
</span><span class="cx"> headerCellElement.className = columnIdentifier + "-column";
</span><span class="cx"> headerCellElement.columnIdentifier = columnIdentifier;
</span><del>- if (column.has("aligned"))
- headerCellElement.classList.add(column.get("aligned"));
</del><ins>+ if (column["aligned"])
+ headerCellElement.classList.add(column["aligned"]);
</ins><span class="cx"> this._headerTableCellElements.set(columnIdentifier, headerCellElement);
</span><span class="cx"> var referenceElement = this._headerTableRowElement.children[insertionIndex];
</span><span class="cx"> this._headerTableRowElement.insertBefore(headerCellElement, referenceElement);
</span><span class="cx">
</span><span class="cx"> var div = headerCellElement.createChild("div");
</span><del>- if (column.has("titleDOMFragment"))
- div.appendChild(column.get("titleDOMFragment"));
</del><ins>+ if (column["titleDOMFragment"])
+ div.appendChild(column["titleDOMFragment"]);
</ins><span class="cx"> else
</span><del>- div.textContent = column.get("title", "");
</del><ins>+ div.textContent = column["title"] || "";
</ins><span class="cx">
</span><del>- if (column.get("sortable")) {
</del><ins>+ if (column["sortable"]) {
</ins><span class="cx"> listeners.register(headerCellElement, "click", this._headerCellClicked);
</span><span class="cx"> headerCellElement.classList.add(WebInspector.DataGrid.SortableColumnStyleClassName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (column.has("group"))
- headerCellElement.classList.add("column-group-" + column.get("group"));
</del><ins>+ if (column["group"])
+ headerCellElement.classList.add("column-group-" + column["group"]);
</ins><span class="cx">
</span><del>- if (column.has("collapsesGroup")) {
- console.assert(column.get("group") !== column.get("collapsesGroup"));
</del><ins>+ if (column["collapsesGroup"]) {
+ console.assert(column["group"] !== column["collapsesGroup"]);
</ins><span class="cx">
</span><span class="cx"> var dividerElement = headerCellElement.createChild("div");
</span><span class="cx"> dividerElement.className = "divider";
</span><span class="lines">@@ -483,7 +481,7 @@
</span><span class="cx"> listeners.register(collapseDiv, "mouseout", this._mouseoutColumnCollapser);
</span><span class="cx"> listeners.register(collapseDiv, "click", this._clickInColumnCollapser);
</span><span class="cx">
</span><del>- headerCellElement.collapsesGroup = column.get("collapsesGroup");
</del><ins>+ headerCellElement.collapsesGroup = column["collapsesGroup"];
</ins><span class="cx"> headerCellElement.classList.add("collapser");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -492,19 +490,19 @@
</span><span class="cx"> var dataColumnElement = headerColumnElement.cloneNode();
</span><span class="cx"> var referenceElement = this._dataTableColumnGroupElement.children[insertionIndex];
</span><span class="cx"> this._dataTableColumnGroupElement.insertBefore(dataColumnElement, referenceElement);
</span><del>- column.set("bodyElement", dataColumnElement);
</del><ins>+ column["bodyElement"] = dataColumnElement;
</ins><span class="cx">
</span><span class="cx"> var fillerCellElement = document.createElement("td");
</span><span class="cx"> fillerCellElement.className = columnIdentifier + "-column";
</span><span class="cx"> fillerCellElement.__columnIdentifier = columnIdentifier;
</span><del>- if (column.has("group"))
- fillerCellElement.classList.add("column-group-" + column.get("group"));
</del><ins>+ if (column["group"])
+ fillerCellElement.classList.add("column-group-" + column["group"]);
</ins><span class="cx"> var referenceElement = this._fillerRowElement.children[insertionIndex];
</span><span class="cx"> this._fillerRowElement.insertBefore(fillerCellElement, referenceElement);
</span><span class="cx">
</span><span class="cx"> listeners.install();
</span><span class="cx">
</span><del>- if (column.has("hidden"))
</del><ins>+ if (column["hidden"])
</ins><span class="cx"> this._hideColumn(columnIdentifier);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -515,16 +513,16 @@
</span><span class="cx"> this.columns.delete(columnIdentifier);
</span><span class="cx"> this.orderedColumns.splice(this.orderedColumns.indexOf(columnIdentifier), 1);
</span><span class="cx">
</span><del>- var removedOrdinal = removedColumn.get("ordinal");
</del><ins>+ var removedOrdinal = removedColumn["ordinal"];
</ins><span class="cx"> for (var [identifier, column] of this.columns) {
</span><del>- var ordinal = column.get("ordinal");
</del><ins>+ var ordinal = column["ordinal"];
</ins><span class="cx"> if (ordinal > removedOrdinal)
</span><del>- column.set("ordinal", ordinal - 1);
</del><ins>+ column["ordinal"] = ordinal - 1;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- removedColumn.get("listeners").uninstall(true);
</del><ins>+ removedColumn["listeners"].uninstall(true);
</ins><span class="cx">
</span><del>- if (removedColumn.has("disclosure"))
</del><ins>+ if (removedColumn["disclosure"])
</ins><span class="cx"> delete this.disclosureColumnIdentifier;
</span><span class="cx">
</span><span class="cx"> if (this.sortColumnIdentifier === columnIdentifier)
</span><span class="lines">@@ -598,7 +596,7 @@
</span><span class="cx"> {
</span><span class="cx"> var result = {};
</span><span class="cx"> for (var [identifier, column] of this.columns) {
</span><del>- var width = this._headerTableColumnGroupElement.children[column.get("ordinal")].style.width;
</del><ins>+ var width = this._headerTableColumnGroupElement.children[column["ordinal"]].style.width;
</ins><span class="cx"> result[columnIdentifier] = parseFloat(width);
</span><span class="cx"> }
</span><span class="cx"> return result;
</span><span class="lines">@@ -608,7 +606,7 @@
</span><span class="cx"> {
</span><span class="cx"> for (var [identifier, column] of this.columns) {
</span><span class="cx"> var width = (columnWidthsMap[identifier] || 0) + "%";
</span><del>- var ordinal = column.get("ordinal");
</del><ins>+ var ordinal = column["ordinal"];
</ins><span class="cx"> this._headerTableColumnGroupElement.children[ordinal].style.width = width;
</span><span class="cx"> this._dataTableColumnGroupElement.children[ordinal].style.width = width;
</span><span class="cx"> }
</span><span class="lines">@@ -618,20 +616,20 @@
</span><span class="cx">
</span><span class="cx"> _isColumnVisible: function(columnIdentifier)
</span><span class="cx"> {
</span><del>- return !this.columns.get(columnIdentifier).has("hidden");
</del><ins>+ return !this.columns.get(columnIdentifier)["hidden"];
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _showColumn: function(columnIdentifier)
</span><span class="cx"> {
</span><del>- this.columns.get(columnIdentifier).delete("hidden");
</del><ins>+ delete this.columns.get(columnIdentifier)["hidden"];
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _hideColumn: function(columnIdentifier)
</span><span class="cx"> {
</span><span class="cx"> var column = this.columns.get(columnIdentifier);
</span><del>- column.set("hidden", true);
</del><ins>+ column["hidden"] = true;
</ins><span class="cx">
</span><del>- var columnElement = column.get("element");
</del><ins>+ var columnElement = column["element"];
</ins><span class="cx"> columnElement.style.width = 0;
</span><span class="cx">
</span><span class="cx"> this._columnWidthsInitialized = false;
</span><span class="lines">@@ -1027,7 +1025,7 @@
</span><span class="cx"> {
</span><span class="cx"> var collapserColumnIdentifier = null;
</span><span class="cx"> for (var [identifier, column] of this.columns) {
</span><del>- if (column.get("collapsesGroup") == columnGroup) {
</del><ins>+ if (column["collapsesGroup"] == columnGroup) {
</ins><span class="cx"> collapserColumnIdentifier = identifier;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1049,7 +1047,7 @@
</span><span class="cx">
</span><span class="cx"> var showOrHide = columnsWillCollapse ? this._hideColumn : this._showColumn;
</span><span class="cx"> for (var [identifier, column] of this.columns) {
</span><del>- if (column.get("group") === cell.collapsesGroup)
</del><ins>+ if (column["group"] === cell.collapsesGroup)
</ins><span class="cx"> showOrHide.call(this, identifier);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1554,11 +1552,11 @@
</span><span class="cx">
</span><span class="cx"> var column = this.dataGrid.columns.get(columnIdentifier);
</span><span class="cx">
</span><del>- if (column.has("aligned"))
- cellElement.classList.add(column.get("aligned"));
</del><ins>+ if (column["aligned"])
+ cellElement.classList.add(column["aligned"]);
</ins><span class="cx">
</span><del>- if (column.has("group"))
- cellElement.classList.add("column-group-" + column.get("group"));
</del><ins>+ if (column["group"])
+ cellElement.classList.add("column-group-" + column["group"]);
</ins><span class="cx">
</span><span class="cx"> var div = cellElement.createChild("div");
</span><span class="cx"> var content = this.createCellContent(columnIdentifier, cellElement);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js (167954 => 167955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js 2014-04-29 20:33:43 UTC (rev 167954)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js 2014-04-29 20:51:47 UTC (rev 167955)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx">
</span><span class="cx"> var oldColumn = this.columns.get(probe.id);
</span><span class="cx"> this.removeColumn(probe.id);
</span><del>- var ordinal = oldColumn.get("ordinal");
</del><ins>+ var ordinal = oldColumn["ordinal"];
</ins><span class="cx"> var newColumn = {title: event.data.newValue};
</span><span class="cx"> this.insertColumn(probe.id, newColumn, ordinal);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js (167954 => 167955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2014-04-29 20:33:43 UTC (rev 167954)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineDataGrid.js 2014-04-29 20:51:47 UTC (rev 167955)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> this._filterableColumns = [];
</span><span class="cx">
</span><span class="cx"> // Check if any of the cells can be filtered.
</span><del>- for (var identifier in columns) {
- var scopeBar = columns[identifier].scopeBar;
</del><ins>+ for (var [identifier, column] of this.columns) {
+ var scopeBar = columns["scopeBar"];
</ins><span class="cx"> if (!scopeBar)
</span><span class="cx"> continue;
</span><span class="cx"> this._filterableColumns.push(identifier);
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (this._filterableColumns.length) {
</span><del>- var items = [new WebInspector.FlexibleSpaceNavigationItem, this.columns.get(this._filterableColumns[0]).get("scopeBar"), new WebInspector.FlexibleSpaceNavigationItem];
</del><ins>+ var items = [new WebInspector.FlexibleSpaceNavigationItem, this.columns.get(this._filterableColumns[0])["scopeBar"], new WebInspector.FlexibleSpaceNavigationItem];
</ins><span class="cx"> this._navigationBar = new WebInspector.NavigationBar(null, items);
</span><span class="cx"> var container = this.element.appendChild(document.createElement("div"));
</span><span class="cx"> container.className = "navigation-bar-container";
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> console.assert(dataGridNode);
</span><span class="cx">
</span><span class="cx"> for (var identifier of this._filterableColumns) {
</span><del>- var scopeBar = this.columns.get(identifier).get("scopeBar");
</del><ins>+ var scopeBar = this.columns.get(identifier)["scopeBar"];
</ins><span class="cx"> if (!scopeBar || scopeBar.defaultItem.selected)
</span><span class="cx"> continue;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>