Merge pull request jashkenas#515 from octatone/master

Proposed solution for _.size speed improvement RE issue jashkenas#496
axiak · Mar 20, 2012 · 594f1e2 · 594f1e2
2 parents 33be5c6 + 4c2a85f
commit 594f1e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/test/collections.js b/test/collections.js
@@ -275,6 +275,7 @@ $(document).ready(function() {
 
   test('collections: size', function() {
     equal(_.size({one : 1, two : 2, three : 3}), 3, 'can compute the size of an object');
+    equal(_.size([1, 2, 3]), 3, 'can compute the size of an array');
   });
 
 });
diff --git a/underscore.js b/underscore.js
@@ -309,7 +309,7 @@
 
   // Return the number of elements in an object.
   _.size = function(obj) {
-    return _.toArray(obj).length;
+    return _.isArray(obj) ? obj.length : _.keys(obj).length;
   };
 
   // Array Functions