Fix natural sort for file size.

lrsjng · Sep 3, 2013 · f0d7ec7 · f0d7ec7
1 parent 19d53b4
commit f0d7ec7
Showing 1 changed file with 11 additions and 6 deletions.
diff --git 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);
+				val1 = getValue(item1);
-				val2 = '' + getValue(item2);
+				val2 = getValue(item2);
 
-				if (ignorecase) {
+				if (isNaN(val1) || isNaN(val2)) {
-					val1 = val1.toLowerCase();
+					val1 = '' + val1;
-					val2 = val2.toLowerCase();
+					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);