Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-08 10:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #515 from octatone/master

Browse Source 
Proposed solution for _.size speed improvement RE issue #496
This commit is contained in:
Jeremy Ashkenas
2012-03-20 08:16:19 -07:00
parent 33be5c62b8 4c2a85f9c5
commit 594f1e2016
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/collections.js
View File

@@ -275,6 +275,7 @@ $(document).ready(function() {
test('collections: size', function() { test('collections: size', function() {
equal(_.size({one : 1, two : 2, three : 3}), 3, 'can compute the size of an object'); 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');
}); });
}); });

2
underscore.js
View File

@@ -309,7 +309,7 @@
// Return the number of elements in an object. // Return the number of elements in an object.
_.size = function(obj) { _.size = function(obj) {
return _.toArray(obj).length; return _.isArray(obj) ? obj.length : _.keys(obj).length;
}; };
// Array Functions // Array Functions