Title: [222983] trunk/Source/WebInspectorUI
- Revision
- 222983
- Author
- [email protected]
- Date
- 2017-10-06 09:37:56 -0700 (Fri, 06 Oct 2017)
Log Message
Web Inspector: Improve setting the default / initial sort of a Table
https://bugs.webkit.org/show_bug.cgi?id=177989
Patch by Joseph Pecoraro <[email protected]> on 2017-10-06
Reviewed by Brian Burg.
* UserInterface/Views/NetworkTableContentView.js:
(WI.NetworkTableContentView.prototype.initialLayout):
Set the default / initial sort.
* UserInterface/Views/Table.js:
(WI.Table):
(WI.Table.prototype.set sortOrder):
(WI.Table.prototype.set sortColumnIdentifier):
During setup we should always update header views.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (222982 => 222983)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-10-06 16:34:41 UTC (rev 222982)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-10-06 16:37:56 UTC (rev 222983)
@@ -1,3 +1,20 @@
+2017-10-06 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Improve setting the default / initial sort of a Table
+ https://bugs.webkit.org/show_bug.cgi?id=177989
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Views/NetworkTableContentView.js:
+ (WI.NetworkTableContentView.prototype.initialLayout):
+ Set the default / initial sort.
+
+ * UserInterface/Views/Table.js:
+ (WI.Table):
+ (WI.Table.prototype.set sortOrder):
+ (WI.Table.prototype.set sortColumnIdentifier):
+ During setup we should always update header views.
+
2017-10-05 Nikita Vasilyev <[email protected]>
Web Inspector: Styles Redesign: Add support for keyboard navigation (Tab, Shift-Tab, Enter, Esc)
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js (222982 => 222983)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js 2017-10-06 16:34:41 UTC (rev 222982)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js 2017-10-06 16:37:56 UTC (rev 222983)
@@ -566,6 +566,11 @@
this._table.addColumn(this._timeColumn);
this._table.addColumn(this._waterfallColumn);
+ if (!this._table.sortColumnIdentifier) {
+ this._table.sortOrder = WI.Table.SortOrder.Ascending;
+ this._table.sortColumnIdentifier = "waterfall";
+ }
+
this.addSubview(this._table);
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Table.js (222982 => 222983)
--- trunk/Source/WebInspectorUI/UserInterface/Views/Table.js 2017-10-06 16:34:41 UTC (rev 222982)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Table.js 2017-10-06 16:37:56 UTC (rev 222983)
@@ -96,14 +96,13 @@
this._resizeOriginalColumnWidths = null;
this._lastColumnIndexToAcceptRemainderPixel = 0;
- this._sortOrder = WI.Table.SortOrder.Indeterminate;
- this._sortColumnIdentifier = null;
- this._sortRequestIdentifier = undefined;
-
- this._sortOrderSetting = new WI.Setting(this._identifier + "-sort-order", this._sortOrder);
- this._sortColumnIdentifierSetting = new WI.Setting(this._identifier + "-sort", this._sortColumnIdentifier);
+ this._sortOrderSetting = new WI.Setting(this._identifier + "-sort-order", WI.Table.SortOrder.Indeterminate);
+ this._sortColumnIdentifierSetting = new WI.Setting(this._identifier + "-sort", null);
this._columnVisibilitySetting = new WI.Setting(this._identifier + "-column-visibility", {});
+ this._sortOrder = this._sortOrderSetting.value;
+ this._sortColumnIdentifier = this._sortColumnIdentifierSetting.value;
+
this._cachedWidth = NaN;
this._cachedHeight = NaN;
this._cachedScrollTop = NaN;
@@ -133,7 +132,7 @@
set sortOrder(sortOrder)
{
- if (sortOrder === this._sortOrder)
+ if (sortOrder === this._sortOrder && this.didInitialLayout)
return;
console.assert(sortOrder === WI.Table.SortOrder.Indeterminate || sortOrder === WI.Table.SortOrder.Ascending || sortOrder === WI.Table.SortOrder.Descending);
@@ -162,7 +161,7 @@
set sortColumnIdentifier(columnIdentifier)
{
- if (columnIdentifier === this._sortColumnIdentifier)
+ if (columnIdentifier === this._sortColumnIdentifier && this.didInitialLayout)
return;
let column = this._columnSpecs.get(columnIdentifier);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes