From f0d7ec72cf16373011d23b6f14bb633620be295c Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Tue, 3 Sep 2013 12:33:46 +0200 Subject: [PATCH] Fix natural sort for file size. --- src/_h5ai/client/js/inc/ext/sort.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/_h5ai/client/js/inc/ext/sort.js b/src/_h5ai/client/js/inc/ext/sort.js index 862d8086..4d99a698 100644 --- a/src/_h5ai/client/js/inc/ext/sort.js +++ b/src/_h5ai/client/js/inc/ext/sort.js @@ -107,12 +107,17 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e return res; } - val1 = '' + getValue(item1); - val2 = '' + getValue(item2); + val1 = getValue(item1); + val2 = getValue(item2); - if (ignorecase) { - val1 = val1.toLowerCase(); - val2 = val2.toLowerCase(); + if (isNaN(val1) || isNaN(val2)) { + val1 = '' + val1; + val2 = '' + val2; + + if (ignorecase) { + val1 = val1.toLowerCase(); + val2 = val2.toLowerCase(); + } } if (natural) { @@ -130,7 +135,7 @@ modulejs.define('ext/sort', ['_', '$', 'core/settings', 'core/resource', 'core/e var headers = $('#items li.header a'), 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'), sorted = $('#items .item').sort(fn);