Merge pull request #145 from kausters/fix-sorting

Fix aria-sort and initial sorting (was reversed) [fixed tests]
tristen · Nov 12, 2017 · 1dd7594 · 1dd7594
2 parents 614087f + e5b1d25
commit 1dd7594
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/tablesort.js b/src/tablesort.js
@@ -146,7 +146,7 @@
         } else if (sortOrder === 'descending') {
           sortOrder = 'ascending';
         } else {
-          sortOrder = that.options.descending ? 'ascending' : 'descending';
+          sortOrder = that.options.descending ? 'descending' : 'ascending';
         }
 
         header.setAttribute('aria-sort', sortOrder);
@@ -216,9 +216,9 @@
         // the double negatives cancel out
         if (sortOrder === 'descending') {
           newRows.sort(stabilize(sortFunction, true));
-          newRows.reverse();
         } else {
           newRows.sort(stabilize(sortFunction, false));
+          newRows.reverse();
         }
 
         // append rows that already exist rather than creating new ones

diff --git a/test/spec/tablesort.js b/test/spec/tablesort.js
@@ -68,30 +68,30 @@ tape('uses data-sort-order', function(t) {
   event.initEvent('click', true, false);
   el1.dispatchEvent(event);
 
-  t.equal(table.rows[1].cells[0].innerHTML, '3');
+  t.equal(table.rows[1].cells[0].innerHTML, '1');
   t.equal(table.rows[2].cells[0].innerHTML, '2');
-  t.equal(table.rows[3].cells[0].innerHTML, '1');
+  t.equal(table.rows[3].cells[0].innerHTML, '3');
 
   event.initEvent('click', true, false);
   el1.dispatchEvent(event);
 
-  t.equal(table.rows[1].cells[0].innerHTML, '1');
+  t.equal(table.rows[1].cells[0].innerHTML, '3');
   t.equal(table.rows[2].cells[0].innerHTML, '2');
-  t.equal(table.rows[3].cells[0].innerHTML, '3');
+  t.equal(table.rows[3].cells[0].innerHTML, '1');
 
   event.initEvent('click', true, false);
   el2.dispatchEvent(event);
 
-  t.equal(tableDescend.rows[1].cells[0].innerHTML, '1');
+  t.equal(tableDescend.rows[1].cells[0].innerHTML, '3');
   t.equal(tableDescend.rows[2].cells[0].innerHTML, '2');
-  t.equal(tableDescend.rows[3].cells[0].innerHTML, '3');
+  t.equal(tableDescend.rows[3].cells[0].innerHTML, '1');
 
   event.initEvent('click', true, false);
   el2.dispatchEvent(event);
 
-  t.equal(tableDescend.rows[1].cells[0].innerHTML, '3');
+  t.equal(tableDescend.rows[1].cells[0].innerHTML, '1');
   t.equal(tableDescend.rows[2].cells[0].innerHTML, '2');
-  t.equal(tableDescend.rows[3].cells[0].innerHTML, '1');
+  t.equal(tableDescend.rows[3].cells[0].innerHTML, '3');
 
   t.end();
 });