Merge branch 'master' of github.com:documentcloud/underscore

ajacksified · Jan 23, 2012 · f6a1b97 · f6a1b97
2 parents 99c17c4 + 9c88b72
commit f6a1b97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/test/collections.js b/test/collections.js
@@ -35,6 +35,9 @@ $(document).ready(function() {
     var doubled = _.map([1, 2, 3], function(num){ return num * 2; });
     equals(doubled.join(', '), '2, 4, 6', 'doubled numbers');
 
+    doubled = _.collect([1, 2, 3], function(num){ return num * 2; });
+    equals(doubled.join(', '), '2, 4, 6', 'aliased as "collect"');
+
     var tripled = _.map([1, 2, 3], function(num){ return num * this.multiplier; }, {multiplier : 3});
     equals(tripled.join(', '), '3, 6, 9', 'tripled numbers with context');
 

diff --git a/underscore.js b/underscore.js
@@ -89,7 +89,7 @@
 
   // Return the results of applying the iterator to each element.
   // Delegates to **ECMAScript 5**'s native `map` if available.
-  _.map = function(obj, iterator, context) {
+  _.map = _.collect = function(obj, iterator, context) {
     var results = [];
     if (obj == null) return results;
     if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);