| Index: third_party/WebKit/Source/devtools/front_end/data_grid/SortableDataGrid.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/ui_lazy/SortableDataGrid.js b/third_party/WebKit/Source/devtools/front_end/data_grid/SortableDataGrid.js
|
| similarity index 73%
|
| rename from third_party/WebKit/Source/devtools/front_end/ui_lazy/SortableDataGrid.js
|
| rename to third_party/WebKit/Source/devtools/front_end/data_grid/SortableDataGrid.js
|
| index 4e42a0616fed7fb4e2fbb9affbf31d0ecd242471..cbbbbbe549b24f25aa69d9e92cdc71b461e7b562 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/ui_lazy/SortableDataGrid.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/data_grid/SortableDataGrid.js
|
| @@ -3,12 +3,12 @@
|
| // found in the LICENSE file.
|
| /**
|
| * @unrestricted
|
| - * @extends {UI.ViewportDataGrid<!NODE_TYPE>}
|
| + * @extends {DataGrid.ViewportDataGrid<!NODE_TYPE>}
|
| * @template NODE_TYPE
|
| */
|
| -UI.SortableDataGrid = class extends UI.ViewportDataGrid {
|
| +DataGrid.SortableDataGrid = class extends DataGrid.ViewportDataGrid {
|
| /**
|
| - * @param {!Array<!UI.DataGrid.ColumnDescriptor>} columnsArray
|
| + * @param {!Array<!DataGrid.DataGrid.ColumnDescriptor>} columnsArray
|
| * @param {function(!NODE_TYPE, string, string, string)=} editCallback
|
| * @param {function(!NODE_TYPE)=} deleteCallback
|
| * @param {function()=} refreshCallback
|
| @@ -16,13 +16,13 @@ UI.SortableDataGrid = class extends UI.ViewportDataGrid {
|
| constructor(columnsArray, editCallback, deleteCallback, refreshCallback) {
|
| super(columnsArray, editCallback, deleteCallback, refreshCallback);
|
| /** @type {function(!NODE_TYPE, !NODE_TYPE):number} */
|
| - this._sortingFunction = UI.SortableDataGrid.TrivialComparator;
|
| - this.setRootNode(/** @type {!UI.SortableDataGridNode<!NODE_TYPE>} */ (new UI.SortableDataGridNode()));
|
| + this._sortingFunction = DataGrid.SortableDataGrid.TrivialComparator;
|
| + this.setRootNode(/** @type {!DataGrid.SortableDataGridNode<!NODE_TYPE>} */ (new DataGrid.SortableDataGridNode()));
|
| }
|
|
|
| /**
|
| - * @param {!UI.SortableDataGridNode} a
|
| - * @param {!UI.SortableDataGridNode} b
|
| + * @param {!DataGrid.SortableDataGridNode} a
|
| + * @param {!DataGrid.SortableDataGridNode} b
|
| * @return {number}
|
| */
|
| static TrivialComparator(a, b) {
|
| @@ -31,8 +31,8 @@ UI.SortableDataGrid = class extends UI.ViewportDataGrid {
|
|
|
| /**
|
| * @param {string} columnId
|
| - * @param {!UI.SortableDataGridNode} a
|
| - * @param {!UI.SortableDataGridNode} b
|
| + * @param {!DataGrid.SortableDataGridNode} a
|
| + * @param {!DataGrid.SortableDataGridNode} b
|
| * @return {number}
|
| */
|
| static NumericComparator(columnId, a, b) {
|
| @@ -45,8 +45,8 @@ UI.SortableDataGrid = class extends UI.ViewportDataGrid {
|
|
|
| /**
|
| * @param {string} columnId
|
| - * @param {!UI.SortableDataGridNode} a
|
| - * @param {!UI.SortableDataGridNode} b
|
| + * @param {!DataGrid.SortableDataGridNode} a
|
| + * @param {!DataGrid.SortableDataGridNode} b
|
| * @return {number}
|
| */
|
| static StringComparator(columnId, a, b) {
|
| @@ -72,14 +72,14 @@ UI.SortableDataGrid = class extends UI.ViewportDataGrid {
|
| /**
|
| * @param {!Array.<string>} columnNames
|
| * @param {!Array.<string>} values
|
| - * @return {?UI.SortableDataGrid<!UI.SortableDataGridNode>}
|
| + * @return {?DataGrid.SortableDataGrid<!DataGrid.SortableDataGridNode>}
|
| */
|
| static create(columnNames, values) {
|
| var numColumns = columnNames.length;
|
| if (!numColumns)
|
| return null;
|
|
|
| - var columns = /** @type {!Array<!UI.DataGrid.ColumnDescriptor>} */ ([]);
|
| + var columns = /** @type {!Array<!DataGrid.DataGrid.ColumnDescriptor>} */ ([]);
|
| for (var i = 0; i < columnNames.length; ++i)
|
| columns.push({id: String(i), title: columnNames[i], width: columnNames[i].length, sortable: true});
|
|
|
| @@ -89,18 +89,18 @@ UI.SortableDataGrid = class extends UI.ViewportDataGrid {
|
| for (var j = 0; j < columnNames.length; ++j)
|
| data[j] = values[numColumns * i + j];
|
|
|
| - var node = new UI.SortableDataGridNode(data);
|
| + var node = new DataGrid.SortableDataGridNode(data);
|
| node.selectable = false;
|
| nodes.push(node);
|
| }
|
|
|
| - var dataGrid = new UI.SortableDataGrid(columns);
|
| + var dataGrid = new DataGrid.SortableDataGrid(columns);
|
| var length = nodes.length;
|
| var rootNode = dataGrid.rootNode();
|
| for (var i = 0; i < length; ++i)
|
| rootNode.appendChild(nodes[i]);
|
|
|
| - dataGrid.addEventListener(UI.DataGrid.Events.SortingChanged, sortDataGrid);
|
| + dataGrid.addEventListener(DataGrid.DataGrid.Events.SortingChanged, sortDataGrid);
|
|
|
| function sortDataGrid() {
|
| var nodes = dataGrid.rootNode().children;
|
| @@ -117,7 +117,8 @@ UI.SortableDataGrid = class extends UI.ViewportDataGrid {
|
| }
|
| }
|
|
|
| - var comparator = columnIsNumeric ? UI.SortableDataGrid.NumericComparator : UI.SortableDataGrid.StringComparator;
|
| + var comparator =
|
| + columnIsNumeric ? DataGrid.SortableDataGrid.NumericComparator : DataGrid.SortableDataGrid.StringComparator;
|
| dataGrid.sortNodes(comparator.bind(null, sortColumnId), !dataGrid.isSortOrderAscending());
|
| }
|
| return dataGrid;
|
| @@ -127,7 +128,7 @@ UI.SortableDataGrid = class extends UI.ViewportDataGrid {
|
| * @param {!NODE_TYPE} node
|
| */
|
| insertChild(node) {
|
| - var root = /** @type {!UI.SortableDataGridNode<!NODE_TYPE>} */ (this.rootNode());
|
| + var root = /** @type {!DataGrid.SortableDataGridNode<!NODE_TYPE>} */ (this.rootNode());
|
| root.insertChildOrdered(node);
|
| }
|
|
|
| @@ -136,7 +137,7 @@ UI.SortableDataGrid = class extends UI.ViewportDataGrid {
|
| * @param {boolean} reverseMode
|
| */
|
| sortNodes(comparator, reverseMode) {
|
| - this._sortingFunction = UI.SortableDataGrid.Comparator.bind(null, comparator, reverseMode);
|
| + this._sortingFunction = DataGrid.SortableDataGrid.Comparator.bind(null, comparator, reverseMode);
|
| this.rootNode().recalculateSiblings(0);
|
| this.rootNode()._sortChildren(reverseMode);
|
| this.scheduleUpdateStructure();
|
| @@ -145,10 +146,10 @@ UI.SortableDataGrid = class extends UI.ViewportDataGrid {
|
|
|
| /**
|
| * @unrestricted
|
| - * @extends {UI.ViewportDataGridNode<!NODE_TYPE>}
|
| + * @extends {DataGrid.ViewportDataGridNode<!NODE_TYPE>}
|
| * @template NODE_TYPE
|
| */
|
| -UI.SortableDataGridNode = class extends UI.ViewportDataGridNode {
|
| +DataGrid.SortableDataGridNode = class extends DataGrid.ViewportDataGridNode {
|
| /**
|
| * @param {?Object.<string, *>=} data
|
| * @param {boolean=} hasChildren
|
|
|