fix(orderBy): compare timestamps when sorting date objects

Fixes #10512 Closes #10516
angular · Dec 18, 2014 · 661f6d9ecf1459ce3b2794c3cde373e17ae83972 · 661f6d9
1 parent 56a7abd
commit 661f6d9ecf1459ce3b2794c3cde373e17ae83972
Unified Split

Showing with 14 additions and 4 deletions.

+4 −4 src/ng/filter/orderBy.js

+10 −0 test/ng/filter/orderBySpec.js
diff --git a/src/ng/filter/orderBy.js b/src/ng/filter/orderBy.js
@@ -172,14 +172,14 @@ function orderByFilter($parse) {
 
     function objectToString(value) {
       if (value === null) return 'null';
-      if (typeof value.toString === 'function') {
-        value = value.toString();
-        if (isPrimitive(value)) return value;
-      }
       if (typeof value.valueOf === 'function') {
         value = value.valueOf();
         if (isPrimitive(value)) return value;
       }
+      if (typeof value.toString === 'function') {
+        value = value.toString();
+        if (isPrimitive(value)) return value;
+      }
       return '';
     }
 

diff --git a/test/ng/filter/orderBySpec.js b/test/ng/filter/orderBySpec.js
@@ -79,6 +79,16 @@ describe('Filter: orderBy', function() {
               { a:new Date('01/01/2014'), b:3 }]);
     });
 
+    it('should compare timestamps when sorting dates', function() {
+      expect(orderBy([
+        new Date('01/01/2015'),
+        new Date('01/01/2014')
+      ])).toEqualData([
+        new Date('01/01/2014'),
+        new Date('01/01/2015')
+      ]);
+    });
+
 
     it('should use function', function() {
       expect(