Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optional native handling of Dates #200

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Optional native handling of Dates #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dist/sorts/tablesort.date.min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* tablesort v5.2.1 (2020-06-02)
* tablesort v5.2.1 (2020-07-08)
* http://tristen.ca/tablesort/demo/
* Copyright (c) 2020 ; Licensed MIT
*/
!function(){var a=function(a){return a=a.replace(/\-/g,"/"),a=a.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2,4})/,"$3-$2-$1"),new Date(a).getTime()||-1};Tablesort.extend("date",function(b){return(-1!==b.search(/(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\.?\,?\s*/i)||-1!==b.search(/\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/)||-1!==b.search(/(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)/i))&&!isNaN(a(b))},function(b,c){return b=b.toLowerCase(),c=c.toLowerCase(),a(c)-a(b)})}();
!function(){var a=function(a){return time=Date.parse(a),isNaN(time)?(a=a.replace(/\-/g,"/"),a=a.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2,4})/,"$3-$2-$1"),new Date(a).getTime()||-1):Date.parse(a)};Tablesort.extend("date",function(b){return(-1!==b.search(/(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\.?\,?\s*/i)||-1!==b.search(/\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/)||-1!==b.search(/(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)/i))&&!isNaN(a(b))||!isNaN(Date.parse(b))},function(b,c){return b=b.toLowerCase(),c=c.toLowerCase(),a(c)-a(b)})}();
2 changes: 1 addition & 1 deletion dist/sorts/tablesort.dotsep.min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* tablesort v5.2.1 (2020-06-02)
* tablesort v5.2.1 (2020-07-08)
* http://tristen.ca/tablesort/demo/
* Copyright (c) 2020 ; Licensed MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/sorts/tablesort.filesize.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/sorts/tablesort.monthname.min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* tablesort v5.2.1 (2020-06-02)
* tablesort v5.2.1 (2020-07-08)
* http://tristen.ca/tablesort/demo/
* Copyright (c) 2020 ; Licensed MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/sorts/tablesort.number.min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* tablesort v5.2.1 (2020-06-02)
* tablesort v5.2.1 (2020-07-08)
* http://tristen.ca/tablesort/demo/
* Copyright (c) 2020 ; Licensed MIT
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/tablesort.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 10 additions & 4 deletions src/sorts/tablesort.date.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
// Basic dates in dd/mm/yy or dd-mm-yy format.
// Years can be 4 digits. Days and Months can be 1 or 2 digits.
// could also be any nativly parseable date
(function(){
var parseDate = function(date) {
date = date.replace(/\-/g, '/');
date = date.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2,4})/, '$3-$2-$1'); // format before getTime
time = Date.parse(date)
if(isNaN(time)) {
date = date.replace(/\-/g, '/');
date = date.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2,4})/, '$3-$2-$1'); // format before getTime

return new Date(date).getTime() || -1;
return new Date(date).getTime() || -1;
} else {
return Date.parse(date);
}
};

Tablesort.extend('date', function(item) {
return (
item.search(/(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\.?\,?\s*/i) !== -1 ||
item.search(/\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/) !== -1 ||
item.search(/(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)/i) !== -1
) && !isNaN(parseDate(item));
) && !isNaN(parseDate(item)) || !isNaN(Date.parse(item));
}, function(a, b) {
a = a.toLowerCase();
b = b.toLowerCase();
Expand Down
15 changes: 14 additions & 1 deletion test/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,19 @@
</tr>
</thead>
<tbody>
<tr>
<td>4</td>
<td>Zorro</td>
<td>1971-01-01</td>
<td>Wheat</td>
<td>€200</td>
<td>350.0.1284.49</td>
<td>250 GB</td>
<td>2</td>
<td data-sort='d'>1</td>
<td>March</td>
<td>2</td>
</tr>
<tr>
<td>2</td>
<td>Gonzo the Great</td>
Expand All @@ -36,7 +49,7 @@
<td>B</td>
<td data-sort='b'>3</td>
<td>February</td>
<td>2</td>
<td>4</td>
</tr>
<tr>
<td>1</td>
Expand Down
9 changes: 6 additions & 3 deletions test/spec/date.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,23 @@ tape('sorts dates', function(t) {
t.equal(table.rows[1].cells[2].innerHTML, '10/11/1969');
t.equal(table.rows[2].cells[2].innerHTML, '10/11/69');
t.equal(table.rows[3].cells[2].innerHTML, '12-2-70');
t.equal(table.rows[4].cells[2].innerHTML, '1971-01-01');

event.initEvent('click', true, false);
el.dispatchEvent(event);

t.equal(table.rows[1].cells[2].innerHTML, '12-2-70');
t.equal(table.rows[2].cells[2].innerHTML, '10/11/69');
t.equal(table.rows[3].cells[2].innerHTML, '10/11/1969');
t.equal(table.rows[1].cells[2].innerHTML, '1971-01-01');
t.equal(table.rows[2].cells[2].innerHTML, '12-2-70');
t.equal(table.rows[3].cells[2].innerHTML, '10/11/69');
t.equal(table.rows[4].cells[2].innerHTML, '10/11/1969');

event.initEvent('click', true, false);
el.dispatchEvent(event);

t.equal(table.rows[1].cells[2].innerHTML, '10/11/1969');
t.equal(table.rows[2].cells[2].innerHTML, '10/11/69');
t.equal(table.rows[3].cells[2].innerHTML, '12-2-70');
t.equal(table.rows[4].cells[2].innerHTML, '1971-01-01');

t.end();
});
Expand Down
9 changes: 6 additions & 3 deletions test/spec/dotsep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,23 @@ tape('sorts dot separated numbers', function(t) {
t.equal(table.rows[1].cells[5].innerHTML, '11.0.1');
t.equal(table.rows[2].cells[5].innerHTML, '18.0.1284.49');
t.equal(table.rows[3].cells[5].innerHTML, '31.0.1650.57');
t.equal(table.rows[4].cells[5].innerHTML, '350.0.1284.49');

event.initEvent('click', true, false);
el.dispatchEvent(event);

t.equal(table.rows[1].cells[5].innerHTML, '31.0.1650.57');
t.equal(table.rows[2].cells[5].innerHTML, '18.0.1284.49');
t.equal(table.rows[3].cells[5].innerHTML, '11.0.1');
t.equal(table.rows[1].cells[5].innerHTML, '350.0.1284.49');
t.equal(table.rows[2].cells[5].innerHTML, '31.0.1650.57');
t.equal(table.rows[3].cells[5].innerHTML, '18.0.1284.49');
t.equal(table.rows[4].cells[5].innerHTML, '11.0.1');

event.initEvent('click', true, false);
el.dispatchEvent(event);

t.equal(table.rows[1].cells[5].innerHTML, '11.0.1');
t.equal(table.rows[2].cells[5].innerHTML, '18.0.1284.49');
t.equal(table.rows[3].cells[5].innerHTML, '31.0.1650.57');
t.equal(table.rows[4].cells[5].innerHTML, '350.0.1284.49');

t.end();
});
9 changes: 6 additions & 3 deletions test/spec/filesize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,23 @@ tape('sorts filesize', function(t) {
t.equal(table.rows[1].cells[6].innerHTML, '134 B');
t.equal(table.rows[2].cells[6].innerHTML, '124k');
t.equal(table.rows[3].cells[6].innerHTML, '134.56 GB');
t.equal(table.rows[4].cells[6].innerHTML, '250 GB');

event.initEvent('click', true, false);
el.dispatchEvent(event);

t.equal(table.rows[1].cells[6].innerHTML, '134.56 GB');
t.equal(table.rows[2].cells[6].innerHTML, '124k');
t.equal(table.rows[3].cells[6].innerHTML, '134 B');
t.equal(table.rows[1].cells[6].innerHTML, '250 GB');
t.equal(table.rows[2].cells[6].innerHTML, '134.56 GB');
t.equal(table.rows[3].cells[6].innerHTML, '124k');
t.equal(table.rows[4].cells[6].innerHTML, '134 B');

event.initEvent('click', true, false);
el.dispatchEvent(event);

t.equal(table.rows[1].cells[6].innerHTML, '134 B');
t.equal(table.rows[2].cells[6].innerHTML, '124k');
t.equal(table.rows[3].cells[6].innerHTML, '134.56 GB');
t.equal(table.rows[4].cells[6].innerHTML, '250 GB');

t.end();
});
Expand Down
11 changes: 7 additions & 4 deletions test/spec/monthname.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,24 @@ tape('sorts monthname', function(t) {

t.equal(table.rows[1].cells[9].innerHTML, 'January');
t.equal(table.rows[2].cells[9].innerHTML, 'February');
t.equal(table.rows[3].cells[9].innerHTML, 'April');
t.equal(table.rows[3].cells[9].innerHTML, 'March');
t.equal(table.rows[4].cells[9].innerHTML, 'April');

event.initEvent('click', true, false);
el.dispatchEvent(event);

t.equal(table.rows[1].cells[9].innerHTML, 'April');
t.equal(table.rows[2].cells[9].innerHTML, 'February');
t.equal(table.rows[3].cells[9].innerHTML, 'January');
t.equal(table.rows[2].cells[9].innerHTML, 'March');
t.equal(table.rows[3].cells[9].innerHTML, 'February');
t.equal(table.rows[4].cells[9].innerHTML, 'January');

event.initEvent('click', true, false);
el.dispatchEvent(event);

t.equal(table.rows[1].cells[9].innerHTML, 'January');
t.equal(table.rows[2].cells[9].innerHTML, 'February');
t.equal(table.rows[3].cells[9].innerHTML, 'April');
t.equal(table.rows[3].cells[9].innerHTML, 'March');
t.equal(table.rows[4].cells[9].innerHTML, 'April');

t.end();
});
Expand Down
18 changes: 12 additions & 6 deletions test/spec/number.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,23 @@ tape('sorts numbers', function(t) {
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, '3');
t.equal(table.rows[4].cells[0].innerHTML, '4');

event.initEvent('click', true, false);
el.dispatchEvent(event);

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, '1');
t.equal(table.rows[1].cells[0].innerHTML, '4');
t.equal(table.rows[2].cells[0].innerHTML, '3');
t.equal(table.rows[3].cells[0].innerHTML, '2');
t.equal(table.rows[4].cells[0].innerHTML, '1');

event.initEvent('click', true, false);
el.dispatchEvent(event);

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, '3');
t.equal(table.rows[4].cells[0].innerHTML, '4');

t.end();
});
Expand All @@ -38,20 +41,23 @@ tape('sorts currency', function(t) {
t.equal(table.rows[1].cells[4].innerHTML, '$0.79');
t.equal(table.rows[2].cells[4].innerHTML, '£2.79');
t.equal(table.rows[3].cells[4].innerHTML, '63€');
t.equal(table.rows[4].cells[4].innerHTML, '€200');

event.initEvent('click', true, false);
el.dispatchEvent(event);

t.equal(table.rows[1].cells[4].innerHTML, '63€');
t.equal(table.rows[2].cells[4].innerHTML, '£2.79');
t.equal(table.rows[3].cells[4].innerHTML, '$0.79');
t.equal(table.rows[1].cells[4].innerHTML, '€200');
t.equal(table.rows[2].cells[4].innerHTML, '63€');
t.equal(table.rows[3].cells[4].innerHTML, '£2.79');
t.equal(table.rows[4].cells[4].innerHTML, '$0.79');

event.initEvent('click', true, false);
el.dispatchEvent(event);

t.equal(table.rows[1].cells[4].innerHTML, '$0.79');
t.equal(table.rows[2].cells[4].innerHTML, '£2.79');
t.equal(table.rows[3].cells[4].innerHTML, '63€');
t.equal(table.rows[4].cells[4].innerHTML, '€200');

t.end();
});
Expand Down
33 changes: 21 additions & 12 deletions test/spec/tablesort.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,25 @@ tape('sorts insensitive', function(t) {
// Test that more than one table cell is evaluated
// to determine sort type.
t.equal(table.rows[1].cells[7].innerHTML, '1');
t.equal(table.rows[2].cells[7].innerHTML, 'A');
t.equal(table.rows[3].cells[7].innerHTML, 'B');
t.equal(table.rows[2].cells[7].innerHTML, '2');
t.equal(table.rows[3].cells[7].innerHTML, 'A');
t.equal(table.rows[4].cells[7].innerHTML, 'B');

event.initEvent('click', true, false);
el.dispatchEvent(event);

t.equal(table.rows[1].cells[7].innerHTML, 'B');
t.equal(table.rows[2].cells[7].innerHTML, 'A');
t.equal(table.rows[3].cells[7].innerHTML, '1');
t.equal(table.rows[3].cells[7].innerHTML, '2');
t.equal(table.rows[4].cells[7].innerHTML, '1');

event.initEvent('click', true, false);
el.dispatchEvent(event);

t.equal(table.rows[1].cells[7].innerHTML, '1');
t.equal(table.rows[2].cells[7].innerHTML, 'A');
t.equal(table.rows[3].cells[7].innerHTML, 'B');
t.equal(table.rows[2].cells[7].innerHTML, '2');
t.equal(table.rows[3].cells[7].innerHTML, 'A');
t.equal(table.rows[4].cells[7].innerHTML, 'B');

t.end();
});
Expand All @@ -40,20 +43,23 @@ tape('uses data-sort', function(t) {
t.equal(table.rows[1].cells[8].innerHTML, '2', 'cell is 2 but data-sort is a');
t.equal(table.rows[2].cells[8].innerHTML, '3', 'cell is 3 but data-sort is b');
t.equal(table.rows[3].cells[8].innerHTML, '1', 'cell is 1 but data-sort is c');
t.equal(table.rows[4].cells[8].innerHTML, '1', 'cell is 1 but data-sort is d');

event.initEvent('click', true, false);
el.dispatchEvent(event);

t.equal(table.rows[1].cells[8].innerHTML, '1', 'cell is 1 but data-sort is c');
t.equal(table.rows[2].cells[8].innerHTML, '3', 'cell is 3 but data-sort is b');
t.equal(table.rows[3].cells[8].innerHTML, '2', 'cell is 2 but data-sort is a');
t.equal(table.rows[1].cells[8].innerHTML, '1', 'cell is 1 but data-sort is d');
t.equal(table.rows[2].cells[8].innerHTML, '1', 'cell is 1 but data-sort is c');
t.equal(table.rows[3].cells[8].innerHTML, '3', 'cell is 3 but data-sort is b');
t.equal(table.rows[4].cells[8].innerHTML, '2', 'cell is 2 but data-sort is a');

event.initEvent('click', true, false);
el.dispatchEvent(event);

t.equal(table.rows[1].cells[8].innerHTML, '2', 'cell is 2 but data-sort is a');
t.equal(table.rows[2].cells[8].innerHTML, '3', 'cell is 3 but data-sort is b');
t.equal(table.rows[3].cells[8].innerHTML, '1', 'cell is 1 but data-sort is c');
t.equal(table.rows[4].cells[8].innerHTML, '1', 'cell is 1 but data-sort is d');

t.end();
});
Expand All @@ -69,15 +75,18 @@ tape('uses data-sort-order', function(t) {
el1.dispatchEvent(event);

t.equal(table.rows[1].cells[0].innerHTML, '1');
t.equal(table.rows[2].cells[0].innerHTML, '2');
t.equal(table.rows[2].cells[0].innerHTML, '4');
t.equal(table.rows[3].cells[0].innerHTML, '3');
t.equal(table.rows[4].cells[0].innerHTML, '2');


event.initEvent('click', true, false);
el1.dispatchEvent(event);

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, '1');
t.equal(table.rows[1].cells[0].innerHTML, '2');
t.equal(table.rows[2].cells[0].innerHTML, '3');
t.equal(table.rows[3].cells[0].innerHTML, '4');
t.equal(table.rows[4].cells[0].innerHTML, '1');

event.initEvent('click', true, false);
el2.dispatchEvent(event);
Expand Down