2.2.10

dist/js/veasy-table.js

@@ -6,17 +6,30 @@ angular.module('veasy.table', [
 ]);
 
 angular.module('veasy.table')
-
   .filter('vtUrl', ['$sanitize', function ($sanitize) {
     return function (input, text, target) {
-      // if (!text) {
-      //   var matches = input.match(/\w+:\/\/([\w|\.]+)/);
-      //   if (matches) text = matches[0];
-      // }
-      // return $sanitize('<a target="' + target + '" href="' + input + '">' + text + '</a>');
-
       return $sanitize('<a target="' + target + '" href="' + input + '">' + input + '</a>');
     };
+  }])
+  .filter('vtLocaleOrderBy', [function () {
+    return function (array, predicate, reverse) {
+      if (!Array.isArray(array)) return array;
+      if (!predicate) return array;
+
+      array.sort(function (first, second) {
+        const valueA = first[predicate];
+        const valueB = second[predicate];
+        if (typeof valueA === 'string') {
+          return !reverse ? valueA.localeCompare(valueB) : valueB.localeCompare(valueA);
+        }
+        if (typeof valueA === 'number' || typeof valueA === 'boolean') {
+          return !reverse ? valueA - valueB : valueB - valueA;
+        }
+        return 0;
+      });
+
+      return array;
+    }
   }]);
 
 angular.module('veasy.table')
@@ -795,7 +808,7 @@ angular.module('veasy.table')
           }
           scope.predicate = predicate;
           if (scope.predicate !== '') {
-            var list = $filter('orderBy')(scope.filteredList, scope.predicate, scope.reverse);
+            var list = $filter('vtLocaleOrderBy')(scope.filteredList, scope.predicate, scope.reverse);
             paginate(list, scope.config.pagination.itemsPerPage, 0);
           }
           scope.$emit('veasyTable:onEndSort');

mocks/MOCK_DATA_NEW.json

@@ -11,7 +11,7 @@
   },
   {
     "id":2,
-    "first_name":"Lisa",
+    "first_name":"Aalana",
     "gender":"Female",
     "company":"Apple",
     "address":"193 Straubel Plaza",
@@ -71,7 +71,7 @@
   },
   {
     "id":8,
-    "first_name":"Bobby",
+    "first_name":"Áalfred",
     "gender":null,
     "company":null,
     "address":"9 Grover Center",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-veasy-table",
-  "version": "2.2.9",
+  "version": "2.2.10",
   "description": "AngularJS directive to create quickly data tables without giving up the beauty and functionality.",
   "author": "Fernando Machado Bernardino <[email protected]> (https://github.com/NandoMB)",
   "license": "MIT",

src/js/directives/veasyTable.js

@@ -210,7 +210,7 @@ angular.module('veasy.table')
           }
           scope.predicate = predicate;
           if (scope.predicate !== '') {
-            var list = $filter('orderBy')(scope.filteredList, scope.predicate, scope.reverse);
+            var list = $filter('vtLocaleOrderBy')(scope.filteredList, scope.predicate, scope.reverse);
             paginate(list, scope.config.pagination.itemsPerPage, 0);
           }
           scope.$emit('veasyTable:onEndSort');

src/js/filters/customFilter.js

@@ -0,0 +1,26 @@
+angular.module('veasy.table')
+  .filter('vtUrl', ['$sanitize', function ($sanitize) {
+    return function (input, text, target) {
+      return $sanitize('<a target="' + target + '" href="' + input + '">' + input + '</a>');
+    };
+  }])
+  .filter('vtLocaleOrderBy', [function () {
+    return function (array, predicate, reverse) {
+      if (!Array.isArray(array)) return array;
+      if (!predicate) return array;
+
+      array.sort(function (first, second) {
+        const valueA = first[predicate];
+        const valueB = second[predicate];
+        if (typeof valueA === 'string') {
+          return !reverse ? valueA.localeCompare(valueB) : valueB.localeCompare(valueA);
+        }
+        if (typeof valueA === 'number' || typeof valueA === 'boolean') {
+          return !reverse ? valueA - valueB : valueB - valueA;
+        }
+        return 0;
+      });
+
+      return array;
+    }
+  }]);