Browse Source

Merge pull request #2240 from t02uk/develop

Fix #2239 - natural-sorting not work when data including numeric number, null or undefined.
wenzhixin 9 years ago
parent
commit
f3405c7c4c
1 changed files with 12 additions and 2 deletions
  1. 12 2
      src/extensions/natural-sorting/bootstrap-table-natural-sorting.js

+ 12 - 2
src/extensions/natural-sorting/bootstrap-table-natural-sorting.js

@@ -29,8 +29,18 @@ function alphanum(a, b) {
     return tz;
   }
 
-  var aa = chunkify(a);
-  var bb = chunkify(b);
+  function stringfy(v) {
+    if (typeof(v) === "number") {
+      v = "" + v;
+    }
+    if (!v) {
+      v = "";
+    }
+    return v;
+  }
+
+  var aa = chunkify(stringfy(a));
+  var bb = chunkify(stringfy(b));
 
   for (x = 0; aa[x] && bb[x]; x++) {
     if (aa[x] !== bb[x]) {