Fixes jashkenas#435 -- allows _.max and _.min on arrays of dates with…

…out converting them to numbers.
piouPiouM · Jan 24, 2012 · fe5cc27 · fe5cc27
1 parent 21e188b
commit fe5cc27
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/test/collections.js b/test/collections.js
@@ -185,7 +185,9 @@ $(document).ready(function() {
 
   // Relevant when using ClojureScript
   test('collections: invoke when strings have a call method', function() {
-    String.prototype.call = function(){return 42;}
+    String.prototype.call = function() {
+      return 42;
+    };
     var list = [[5, 1, 7], [3, 2, 1]];
     var s = "foo";
     equals(s.call(), 42, "call function exists");
@@ -219,6 +221,10 @@ $(document).ready(function() {
 
     equals(Infinity, _.min({}), 'Minimum value of an empty object');
     equals(Infinity, _.min([]), 'Minimum value of an empty array');
+
+    var now = new Date(9999999999);
+    var then = new Date(0);
+    equals(_.min([now, then]), then);
   });
 
   test('collections: sortBy', function() {

diff --git a/underscore.js b/underscore.js
@@ -227,7 +227,7 @@
 
   // Return the maximum element or (element-based computation).
   _.max = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj)) return Math.max.apply(Math, obj);
+    if (!iterator && _.isArray(obj) && obj[0] === +obj[0]) return Math.max.apply(Math, obj);
     if (!iterator && _.isEmpty(obj)) return -Infinity;
     var result = {computed : -Infinity};
     each(obj, function(value, index, list) {
@@ -239,7 +239,7 @@
 
   // Return the minimum element (or element-based computation).
   _.min = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj)) return Math.min.apply(Math, obj);
+    if (!iterator && _.isArray(obj) && obj[0] === +obj[0]) return Math.min.apply(Math, obj);
     if (!iterator && _.isEmpty(obj)) return Infinity;
     var result = {computed : Infinity};
     each(obj, function(value, index, list) {