<!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>[196549] 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/196549">196549</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-13 01:23:40 -0800 (Sat, 13 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: DataGrid Header Cells should have Context Menu for Sorting
https://bugs.webkit.org/show_bug.cgi?id=154050
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2016-02-13
Reviewed by Joseph Pecoraro.
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid.prototype.set sortOrder):
(WebInspector.DataGrid.prototype._toggledSortOrder):
Returns the opposite sort order from the current order.
(WebInspector.DataGrid.prototype._selectSortColumnAndSetOrder):
Changes the selected column to the one with the specified identifier and
then switches the sort order to the given order.
(WebInspector.DataGrid.prototype._headerCellClicked):
Moved logic for switching cells/sort-order to a separate function for
better reusability.
(WebInspector.DataGrid.prototype._contextMenuInHeader):
Adds context menu items on DataGrid header items to change the current
sort order to the specified order. If the context menu is on the selected
header item, only show the sort order that is not currently applied.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/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 (196548 => 196549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-02-13 08:49:22 UTC (rev 196548)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-02-13 09:23:40 UTC (rev 196549)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-02-13 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: DataGrid Header Cells should have Context Menu for Sorting
+ https://bugs.webkit.org/show_bug.cgi?id=154050
+
+ Reviewed by Joseph Pecoraro.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Views/DataGrid.js:
+ (WebInspector.DataGrid.prototype.set sortOrder):
+ (WebInspector.DataGrid.prototype._toggledSortOrder):
+ Returns the opposite sort order from the current order.
+
+ (WebInspector.DataGrid.prototype._selectSortColumnAndSetOrder):
+ Changes the selected column to the one with the specified identifier and
+ then switches the sort order to the given order.
+
+ (WebInspector.DataGrid.prototype._headerCellClicked):
+ Moved logic for switching cells/sort-order to a separate function for
+ better reusability.
+
+ (WebInspector.DataGrid.prototype._contextMenuInHeader):
+ Adds context menu items on DataGrid header items to change the current
+ sort order to the specified order. If the context menu is on the selected
+ header item, only show the sort order that is not currently applied.
+
</ins><span class="cx"> 2016-02-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Rename domAgent to domTreeManager in DOMNode
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (196548 => 196549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-02-13 08:49:22 UTC (rev 196548)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-02-13 09:23:40 UTC (rev 196549)
</span><span class="lines">@@ -617,6 +617,8 @@
</span><span class="cx"> localizedStrings["Small Icons"] = "Small Icons";
</span><span class="cx"> localizedStrings["Socket"] = "Socket";
</span><span class="cx"> localizedStrings["Sockets"] = "Sockets";
</span><ins>+localizedStrings["Sort Ascending"] = "Sort Ascending";
+localizedStrings["Sort Descending"] = "Sort Descending";
</ins><span class="cx"> localizedStrings["Spacing"] = "Spacing";
</span><span class="cx"> localizedStrings["Specificity: (%d, %d, %d)"] = "Specificity: (%d, %d, %d)";
</span><span class="cx"> localizedStrings["Specificity: No value for selected element"] = "Specificity: No value for selected element";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (196548 => 196549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-02-13 08:49:22 UTC (rev 196548)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-02-13 09:23:40 UTC (rev 196549)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx">
</span><span class="cx"> set sortOrder(order)
</span><span class="cx"> {
</span><del>- if (order === this._sortOrder)
</del><ins>+ if (!order || order === this._sortOrder)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._sortOrder = order;
</span><span class="lines">@@ -941,6 +941,17 @@
</span><span class="cx"> tbody.appendChild(fillerRowElement); // We expect to find a filler row when attaching nodes.
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _toggledSortOrder()
+ {
+ return this._sortOrder !== WebInspector.DataGrid.SortOrder.Descending ? WebInspector.DataGrid.SortOrder.Descending : WebInspector.DataGrid.SortOrder.Ascending;
+ }
+
+ _selectSortColumnAndSetOrder(columnIdentifier, sortOrder)
+ {
+ this.sortColumnIdentifier = columnIdentifier;
+ this.sortOrder = sortOrder;
+ }
+
</ins><span class="cx"> _keyDown(event)
</span><span class="cx"> {
</span><span class="cx"> if (!this.selectedNode || event.shiftKey || event.metaKey || event.ctrlKey || this._editing)
</span><span class="lines">@@ -1047,18 +1058,12 @@
</span><span class="cx">
</span><span class="cx"> _headerCellClicked(event)
</span><span class="cx"> {
</span><del>- var cell = event.target.enclosingNodeOrSelfWithNodeName("th");
</del><ins>+ let cell = event.target.enclosingNodeOrSelfWithNodeName("th");
</ins><span class="cx"> if (!cell || !cell.columnIdentifier || !cell.classList.contains(WebInspector.DataGrid.SortableColumnStyleClassName))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var clickedColumnIdentifier = cell.columnIdentifier;
- if (this.sortColumnIdentifier === clickedColumnIdentifier) {
- if (this.sortOrder !== WebInspector.DataGrid.SortOrder.Descending)
- this.sortOrder = WebInspector.DataGrid.SortOrder.Descending;
- else
- this.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
- } else
- this.sortColumnIdentifier = clickedColumnIdentifier;
</del><ins>+ let sortOrder = this._sortColumnIdentifier === cell.columnIdentifier ? this._toggledSortOrder() : this.sortOrder;
+ this._selectSortColumnAndSetOrder(cell.columnIdentifier, sortOrder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _mouseoverColumnCollapser(event)
</span><span class="lines">@@ -1178,7 +1183,22 @@
</span><span class="cx"> if (this._hasCopyableData())
</span><span class="cx"> contextMenu.appendItem(WebInspector.UIString("Copy Table"), this._copyTable.bind(this));
</span><span class="cx">
</span><del>- // FIXME: <https://webkit.org/b/154050> Web Inspector: DataGrid Header Cells should have Context Menu for Sorting
</del><ins>+ let cell = event.target.enclosingNodeOrSelfWithNodeName("th");
+ if (cell && cell.columnIdentifier && cell.classList.contains(WebInspector.DataGrid.SortableColumnStyleClassName)) {
+ contextMenu.appendSeparator();
+
+ if (this.sortColumnIdentifier !== cell.columnIdentifier || this.sortOrder !== WebInspector.DataGrid.SortOrder.Ascending) {
+ contextMenu.appendItem(WebInspector.UIString("Sort Ascending"), () => {
+ this._selectSortColumnAndSetOrder(cell.columnIdentifier, WebInspector.DataGrid.SortOrder.Ascending);
+ });
+ }
+
+ if (this.sortColumnIdentifier !== cell.columnIdentifier || this.sortOrder !== WebInspector.DataGrid.SortOrder.Descending) {
+ contextMenu.appendItem(WebInspector.UIString("Sort Descending"), () => {
+ this._selectSortColumnAndSetOrder(cell.columnIdentifier, WebInspector.DataGrid.SortOrder.Descending);
+ });
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _contextMenuInDataTable(event)
</span></span></pre>
</div>
</div>
</body>
</html>