diff --git a/README b/README
index 333b13f45..c7eb97bd1 100644
--- a/README
+++ b/README
@@ -27,5 +27,6 @@ Many thanks to our contributors:
Kris Kowal
Jed Schmidt
Noah Sloan
+ Nick Stenning
Luke Sutton
John Wright
diff --git a/index.html b/index.html
index 289bbb520..597d8f602 100644
--- a/index.html
+++ b/index.html
@@ -110,12 +110,12 @@ Downloads (Right-click, and u
@@ -216,10 +216,10 @@ Object-Oriented and Functional Styles
_(lyrics).chain()
.map(function(line) { return line.words.split(' '); })
.flatten()
- .reduce({}, function(counts, word) {
+ .reduce(function(counts, word) {
counts[word] = (counts[word] || 0) + 1;
return counts;
-}).value();
+}, {}).value();
=> {lumberjack : 2, all : 4, night : 2 ... }
@@ -261,7 +261,7 @@ Collection Functions (Arrays or Objects)
=> [3, 6, 9]
- _.reduce(list, memo, iterator, [context])
+ _.reduce(list, iterator, memo, [context])
Aliases: inject, foldl
Also known as inject and foldl, reduce boils down a
@@ -270,12 +270,12 @@
Collection Functions (Arrays or Objects)
iterator.
-var sum = _.reduce([1, 2, 3], 0, function(memo, num){ return memo + num });
+var sum = _.reduce([1, 2, 3], function(memo, num){ return memo + num }, 0);
=> 6
- _.reduceRight(list, memo, iterator, [context])
+ _.reduceRight(list, iterator, memo, [context])
Alias: foldr
The right-associative version of reduce. Delegates to the
@@ -285,7 +285,7 @@
Collection Functions (Arrays or Objects)
var list = [[0, 1], [2, 3], [4, 5]];
-var flat = _.reduceRight(list, [], function(a, b) { return a.concat(b); });
+var flat = _.reduceRight(list, function(a, b) { return a.concat(b); }, []);
=> [4, 5, 2, 3, 0, 1]
@@ -356,6 +356,7 @@ Collection Functions (Arrays or Objects)
_.include(list, value)
+ Alias: contains
Returns true if the value is present in the list, using
=== to test equality. Uses indexOf internally, if list
@@ -1128,6 +1129,13 @@
Links & Suggested Reading
The source is
available on GitHub.
+
+
+ Underscore.strings,
+ an Underscore extension that adds functions for string-manipulation:
+ trim, startsWith, contains, capitalize,
+ reverse, sprintf, and more.
+
Ruby's Enumerable module.
@@ -1150,10 +1158,20 @@
Links & Suggested Reading
Change Log
+
+
+ The method signature of _.reduce has been changed to match
+ the ECMAScript 5 signature, instead of the Ruby/Prototype.js version.
+ This is a backwards-incompatible change. _.template may now be
+ called with no arguments, and preserves whitespace. _.contains
+ is a new alias for _.include.
+
+
- Andri Möll contributed the _.memoize function, which can be
- used to speed up expensive repeated computations by caching the results.
+ Andri Möll contributed the _.memoize
+ function, which can be used to speed up expensive repeated computations
+ by caching the results.
@@ -1248,7 +1266,8 @@
Change Log
Added an _.isArguments function. Lots of little safety checks
and optimizations contributed by
- Noah Sloan and Andri Möll.
+ Noah Sloan and
+ Andri Möll.
diff --git a/package.json b/package.json
index 5a1d90d4a..f00dacc03 100644
--- a/package.json
+++ b/package.json
@@ -8,5 +8,5 @@
"dependencies" : [],
"lib" : ".",
"main" : "underscore.js",
- "version" : "1.0.4"
+ "version" : "1.1.0"
}
diff --git a/test/chaining.js b/test/chaining.js
index 55f0c8c0d..e633ba5ad 100644
--- a/test/chaining.js
+++ b/test/chaining.js
@@ -12,11 +12,11 @@ $(document).ready(function() {
var counts = _(lyrics).chain()
.map(function(line) { return line.split(''); })
.flatten()
- .reduce({}, function(hash, l) {
+ .reduce(function(hash, l) {
hash[l] = hash[l] || 0;
hash[l]++;
return hash;
- }).value();
+ }, {}).value();
ok(counts['a'] == 16 && counts['e'] == 10, 'counted all the letters in the song');
});
diff --git a/test/collections.js b/test/collections.js
index 3759a6495..9c72e889e 100644
--- a/test/collections.js
+++ b/test/collections.js
@@ -53,22 +53,22 @@ $(document).ready(function() {
});
test('collections: reduce', function() {
- var sum = _.reduce([1, 2, 3], 0, function(sum, num){ return sum + num; });
+ var sum = _.reduce([1, 2, 3], function(sum, num){ return sum + num; }, 0);
equals(sum, 6, 'can sum up an array');
var context = {multiplier : 3};
- sum = _.reduce([1, 2, 3], 0, function(sum, num){ return sum + num * this.multiplier; }, context);
+ sum = _.reduce([1, 2, 3], function(sum, num){ return sum + num * this.multiplier; }, 0, context);
equals(sum, 18, 'can reduce with a context object');
- sum = _.inject([1, 2, 3], 0, function(sum, num){ return sum + num; });
+ sum = _.inject([1, 2, 3], function(sum, num){ return sum + num; }, 0);
equals(sum, 6, 'aliased as "inject"');
- sum = _([1, 2, 3]).reduce(0, function(sum, num){ return sum + num; });
+ sum = _([1, 2, 3]).reduce(function(sum, num){ return sum + num; }, 0);
equals(sum, 6, 'OO-style reduce');
});
test('collections: reduceRight', function() {
- var list = _.foldr([1, 2, 3], '', function(memo, num){ return memo + num; });
+ var list = _.foldr([1, 2, 3], function(memo, num){ return memo + num; }, '');
equals(list, '321', 'can perform right folds');
});
@@ -111,7 +111,7 @@ $(document).ready(function() {
test('collections: include', function() {
ok(_.include([1,2,3], 2), 'two is in the array');
ok(!_.include([1,3,9], 2), 'two is not in the array');
- ok(_.include({moe:1, larry:3, curly:9}, 3), '_.include on objects checks their values');
+ ok(_.contains({moe:1, larry:3, curly:9}, 3), '_.include on objects checks their values');
ok(_([1,2,3]).include(2), 'OO-style include');
});
diff --git a/test/objects.js b/test/objects.js
index 7dadb8476..fc9c93d42 100644
--- a/test/objects.js
+++ b/test/objects.js
@@ -12,7 +12,7 @@ $(document).ready(function() {
test("objects: functions", function() {
var expected = ["all", "any", "bind", "bindAll", "breakLoop", "clone", "compact",
- "compose","defer", "delay", "detect", "each", "every", "extend", "filter", "first",
+ "compose", "contains", "defer", "delay", "detect", "each", "every", "extend", "filter", "first",
"flatten", "foldl", "foldr", "forEach", "functions", "head", "identity", "include",
"indexOf", "inject", "intersect", "invoke", "isArguments", "isArray", "isBoolean", "isDate", "isElement", "isEmpty", "isEqual",
"isFunction", "isNaN", "isNull", "isNumber", "isRegExp", "isString", "isUndefined", "keys", "last", "lastIndexOf", "map", "max",
diff --git a/test/utility.js b/test/utility.js
index c9498c227..8670a9fda 100644
--- a/test/utility.js
+++ b/test/utility.js
@@ -59,12 +59,19 @@ $(document).ready(function() {
result = fancyTemplate({people : {moe : "Moe", larry : "Larry", curly : "Curly"}});
equals(result, "
", 'can run arbitrary javascript in templates');
+ var noInterpolateTemplate = _.template("Just some text. Hey, I know this is silly but it aids consistency.
Just some text. Hey, I know this is silly but it aids consistency.