mirror_html/h5ai
1
0
Fork 0
mirror of https://github.com/lrsjng/h5ai.git synced 2025-08-05 04:47:29 +02:00
Code Issues Projects Releases Wiki Activity

Fix natural sort for file size.

Browse Source
This commit is contained in:
Lars Jung
2013-09-03 12:33:46 +02:00
parent 19d53b4c14
commit f0d7ec72cf
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/_h5ai/client/js/inc/ext/sort.js
View File

@@ -107,13 +107,18 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e
return res; return res;
} }
val1 = '' + getValue(item1); val1 = getValue(item1);
val2 = '' + getValue(item2); val2 = getValue(item2);
if (isNaN(val1) || isNaN(val2)) {
val1 = '' + val1;
val2 = '' + val2;
if (ignorecase) { if (ignorecase) {
val1 = val1.toLowerCase(); val1 = val1.toLowerCase();
val2 = val2.toLowerCase(); val2 = val2.toLowerCase();
} }
}
if (natural) { if (natural) {
res = naturalCmpFn(val1, val2); res = naturalCmpFn(val1, val2);
@@ -130,7 +135,7 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e
var headers = $('#items li.header a'), var headers = $('#items li.header a'),
header = $('#items li.header a.' + columnClasses[column]), header = $('#items li.header a.' + columnClasses[column]),
fn = cmpFn(columnGetters[column], reverse, settings.ignorecase, settings.natural), fn = cmpFn(columnGetters[column], reverse, settings.ignorecase, column === 0 && settings.natural),
current = $('#items .item'), current = $('#items .item'),
sorted = $('#items .item').sort(fn); sorted = $('#items .item').sort(fn);