Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(599)

Side by Side Diff: third_party/WebKit/Source/devtools/front_end/network/NetworkLogViewColumns.js

Issue 2649153005: DevTools: convert datagrid and network waterfall sort icons to UI.Icon (Closed)
Patch Set: rebaseline Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 /** 4 /**
5 * @unrestricted 5 * @unrestricted
6 */ 6 */
7 Network.NetworkLogViewColumns = class { 7 Network.NetworkLogViewColumns = class {
8 /** 8 /**
9 * @param {!Network.NetworkLogView} networkLogView 9 * @param {!Network.NetworkLogView} networkLogView
10 * @param {!Network.NetworkTransferTimeCalculator} timeCalculator 10 * @param {!Network.NetworkTransferTimeCalculator} timeCalculator
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 this._waterfallColumn.update(this._activeScroller.scrollTop, this._eventDivi ders, nodes); 196 this._waterfallColumn.update(this._activeScroller.scrollTop, this._eventDivi ders, nodes);
197 } 197 }
198 198
199 _createWaterfallHeader() { 199 _createWaterfallHeader() {
200 this._waterfallHeaderElement = this._waterfallColumn.contentElement.createCh ild('div', 'network-waterfall-header'); 200 this._waterfallHeaderElement = this._waterfallColumn.contentElement.createCh ild('div', 'network-waterfall-header');
201 this._waterfallHeaderElement.addEventListener('click', waterfallHeaderClicke d.bind(this)); 201 this._waterfallHeaderElement.addEventListener('click', waterfallHeaderClicke d.bind(this));
202 this._waterfallHeaderElement.addEventListener( 202 this._waterfallHeaderElement.addEventListener(
203 'contextmenu', event => this._innerHeaderContextMenu(new UI.ContextMenu( event))); 203 'contextmenu', event => this._innerHeaderContextMenu(new UI.ContextMenu( event)));
204 var innerElement = this._waterfallHeaderElement.createChild('div'); 204 var innerElement = this._waterfallHeaderElement.createChild('div');
205 innerElement.textContent = Common.UIString('Waterfall'); 205 innerElement.textContent = Common.UIString('Waterfall');
206 this._waterfallColumnSortIcon = this._waterfallHeaderElement.createChild('di v', 'sort-order-icon-container') 206 this._waterfallColumnSortIcon = UI.Icon.create('', 'sort-order-icon');
207 .createChild('div', 'sort-order-icon'); 207 this._waterfallHeaderElement.createChild('div', 'sort-order-icon-container')
208 .appendChild(this._waterfallColumnSortIcon);
208 209
209 /** 210 /**
210 * @this {Network.NetworkLogViewColumns} 211 * @this {Network.NetworkLogViewColumns}
211 */ 212 */
212 function waterfallHeaderClicked() { 213 function waterfallHeaderClicked() {
213 var sortOrders = DataGrid.DataGrid.Order; 214 var sortOrders = DataGrid.DataGrid.Order;
214 var sortOrder = 215 var sortOrder =
215 this._dataGrid.sortOrder() === sortOrders.Ascending ? sortOrders.Desce nding : sortOrders.Ascending; 216 this._dataGrid.sortOrder() === sortOrders.Ascending ? sortOrders.Desce nding : sortOrders.Ascending;
216 this._dataGrid.markColumnAsSortedBy('waterfall', sortOrder); 217 this._dataGrid.markColumnAsSortedBy('waterfall', sortOrder);
217 this._sortHandler(); 218 this._sortHandler();
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 } 257 }
257 258
258 sortByCurrentColumn() { 259 sortByCurrentColumn() {
259 this._sortHandler(); 260 this._sortHandler();
260 } 261 }
261 262
262 _sortHandler() { 263 _sortHandler() {
263 var columnId = this._dataGrid.sortColumnId(); 264 var columnId = this._dataGrid.sortColumnId();
264 this._networkLogView.removeAllNodeHighlights(); 265 this._networkLogView.removeAllNodeHighlights();
265 this._waterfallRequestsAreStale = true; 266 this._waterfallRequestsAreStale = true;
266 this._waterfallColumnSortIcon.classList.remove('sort-ascending', 'sort-desce nding');
267
268 if (columnId === 'waterfall') { 267 if (columnId === 'waterfall') {
269 if (this._dataGrid.sortOrder() === DataGrid.DataGrid.Order.Ascending) 268 if (this._dataGrid.sortOrder() === DataGrid.DataGrid.Order.Ascending)
270 this._waterfallColumnSortIcon.classList.add('sort-ascending'); 269 this._waterfallColumnSortIcon.setIconType('smallicon-triangle-up');
271 else 270 else
272 this._waterfallColumnSortIcon.classList.add('sort-descending'); 271 this._waterfallColumnSortIcon.setIconType('smallicon-triangle-down');
273 272
274 var sortFunction = Network.NetworkRequestNode.RequestPropertyComparator.bi nd(null, this._activeWaterfallSortId); 273 var sortFunction = Network.NetworkRequestNode.RequestPropertyComparator.bi nd(null, this._activeWaterfallSortId);
275 this._dataGrid.sortNodes(sortFunction, !this._dataGrid.isSortOrderAscendin g()); 274 this._dataGrid.sortNodes(sortFunction, !this._dataGrid.isSortOrderAscendin g());
276 this._networkLogView.dataGridSorted(); 275 this._networkLogView.dataGridSorted();
277 return; 276 return;
278 } 277 }
278 this._waterfallColumnSortIcon.setIconType('');
279 279
280 var columnConfig = this._columns.find(columnConfig => columnConfig.id === co lumnId); 280 var columnConfig = this._columns.find(columnConfig => columnConfig.id === co lumnId);
281 if (!columnConfig || !columnConfig.sortingFunction) 281 if (!columnConfig || !columnConfig.sortingFunction)
282 return; 282 return;
283 283
284 this._dataGrid.sortNodes(columnConfig.sortingFunction, !this._dataGrid.isSor tOrderAscending()); 284 this._dataGrid.sortNodes(columnConfig.sortingFunction, !this._dataGrid.isSor tOrderAscending());
285 this._networkLogView.dataGridSorted(); 285 this._networkLogView.dataGridSorted();
286 } 286 }
287 287
288 _updateColumns() { 288 _updateColumns() {
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
803 /** 803 /**
804 * @enum {string} 804 * @enum {string}
805 */ 805 */
806 Network.NetworkLogViewColumns.WaterfallSortIds = { 806 Network.NetworkLogViewColumns.WaterfallSortIds = {
807 StartTime: 'startTime', 807 StartTime: 'startTime',
808 ResponseTime: 'responseReceivedTime', 808 ResponseTime: 'responseReceivedTime',
809 EndTime: 'endTime', 809 EndTime: 'endTime',
810 Duration: 'duration', 810 Duration: 'duration',
811 Latency: 'latency' 811 Latency: 'latency'
812 }; 812 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698