Skip to content

Improved text sorting, Added thousand and decimal character configuration #56

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

Open
rokam wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Improved text sorting, Added thousand and decimal character configuration #56

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f9bebe8
Included string extension to remove accents.
Nov 13, 2014
f9951a1
Added option to configure decimal and thousand character.
Nov 13, 2014
f4003fe
Merge branch 'master' of https://github.com/rokam/tablesorter.git
Nov 13, 2014
847ce74
Missing config attributes.
Nov 13, 2014
0770c30
Removed cleanaccent and set the text sort using page locale.
Nov 14, 2014
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
32 changes: 21 additions & 11 deletions jquery.tablesorter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@
sortList: [],
headerList: [],
dateFormat: "us",
decimal: '/\.|\,/g',
decimal: '.',
thousandsSeparator: ',',
onRenderHeader: null,
selectorHeaders: 'thead th',
debug: false
Expand Down Expand Up @@ -603,7 +604,7 @@
// var s = (table.config.parsers[c].type == "text") ? ((order == 0)
// ? makeSortText(c) : makeSortTextDesc(c)) : ((order == 0) ?
// makeSortNumeric(c) : makeSortNumericDesc(c));
var s = (table.config.parsers[c].type == "text") ? ((order == 0) ? makeSortFunction("text", "asc", c) : makeSortFunction("text", "desc", c)) : ((order == 0) ? makeSortFunction("numeric", "asc", c) : makeSortFunction("numeric", "desc", c));
var s = (table.config.parsers[c].type == "text") ? ((order == 0) ? makeSortFunction("text", "asc", c, table) : makeSortFunction("text", "desc", c, table)) : ((order == 0) ? makeSortFunction("numeric", "asc", c, table) : makeSortFunction("numeric", "desc", c, table));
var e = "e" + i;

dynamicExp += "var " + e + " = " + s; // + "(a[" + c + "],b[" + c
Expand Down Expand Up @@ -639,13 +640,19 @@
return cache;
};

function makeSortFunction(type, direction, index) {
function makeSortFunction(type, direction, index, table) {
var a = "a[" + index + "]",
b = "b[" + index + "]";
if (type == 'text' && direction == 'asc') {
return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + a + " < " + b + ") ? -1 : 1 )));";
if (table.config.sortLocaleCompare)
return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + a + ".localeCompare(" + b + "))));";
else
return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + a + " < " + b + ") ? -1 : 1 )));";
} else if (type == 'text' && direction == 'desc') {
return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + b + " < " + a + ") ? -1 : 1 )));";
if (table.config.sortLocaleCompare)
return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + b + ".localeCompare(" + a + "))));";
else
return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + b + " < " + a + ") ? -1 : 1 )));";
} else if (type == 'numeric' && direction == 'asc') {
return "(" + a + " === null && " + b + " === null) ? 0 :(" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + a + " - " + b + "));";
} else if (type == 'numeric' && direction == 'desc') {
Expand Down Expand Up @@ -862,7 +869,8 @@
};
this.isDigit = function (s, config) {
// replace all an wanted chars and match.
return /^[-+]?\d*$/.test($.trim(s.replace(/[,.']/g, '')));
var regex = new RegExp('^[\\-\\+]?\\d*\\' + config.decimal + '?\\d*$', 'g');
return regex.test($.trim(s.replace(new RegExp('\\' + config.thousandsSeparator, 'g'), '')));
};
this.clearTableBody = function (table) {
if ($.browser.msie) {
Expand Down Expand Up @@ -899,17 +907,18 @@
is: function (s, table) {
var c = table.config;
return $.tablesorter.isDigit(s, c);
}, format: function (s) {
return $.tablesorter.formatFloat(s);
}, format: function (s, table) {
return $.tablesorter.formatFloat(s.replace(new RegExp('\\' + table.config.thousandsSeparator, 'g'), '').replace(new RegExp('\\' + table.config.decimal, 'g'), '.'));
}, type: "numeric"
});

ts.addParser({
id: "currency",
is: function (s) {
return /^[£$€?.]/.test(s);
is: function (s, table) {
var c = table.config;
return /^\w?[£$€\?.]/.test(s) && $.tablesorter.isDigit(s.replace(new RegExp(/^\w?[£$€\?.]/g), ""), c);
}, format: function (s) {
return $.tablesorter.formatFloat(s.replace(new RegExp(/[£$€]/g), ""));
return $.tablesorter.formatFloat(s.replace(new RegExp(/^\w?[£$€\?.]/g), "").replace(new RegExp('\\' + table.config.thousandsSeparator, 'g'), '').replace(new RegExp('\\' + table.config.decimal, 'g'), '.'));
}, type: "numeric"
});

Expand Down Expand Up @@ -1036,3 +1045,4 @@
}
});
})(jQuery);