From c174663ea3b7d18d9df4f94dfb69eddc35686522 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Sun, 24 Apr 2011 11:41:31 -0400 Subject: [PATCH 01/36] fixing docs for 'all' --- index.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 04c878ad0..685706fee 100644 --- a/index.html +++ b/index.html @@ -340,16 +340,14 @@

Collection Functions (Arrays or Objects)

- all_.all(list, [iterator], [context]) + all_.all(list, iterator, [context]) Alias: every
Returns true if all of the values in the list pass the iterator - truth test. If an iterator is not provided, the truthy value of - the element will be used instead. Delegates to the native method every, if - present. + truth test. Delegates to the native method every, if present.

-_.all([true, 1, null, 'yes']);
+_.all([true, 1, null, 'yes'], _.identity);
 => false
 
From efa717b09ef63f4ed5ccf18de9d0ef44aa947be1 Mon Sep 17 00:00:00 2001 From: Danny Tatom Date: Tue, 3 May 2011 17:29:21 -0700 Subject: [PATCH 02/36] Should be 'A convenient,' not 'An convenient' --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 685706fee..181c0b1f1 100644 --- a/index.html +++ b/index.html @@ -393,7 +393,7 @@

Collection Functions (Arrays or Objects)

pluck_.pluck(list, propertyName)
- An convenient version of what is perhaps the most common use-case for + A convenient version of what is perhaps the most common use-case for map: extracting a list of property values.


From f8a4b78a86660fe0e030d9bd7f7350fbb788cb01 Mon Sep 17 00:00:00 2001
From: Andrei 
Date: Thu, 5 May 2011 14:00:40 -0400
Subject: [PATCH 03/36] Adding groupBy.

---
 index.html          | 13 ++++++++++++-
 test/collections.js |  6 ++++++
 underscore.js       | 15 +++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 685706fee..d83ed3796 100644
--- a/index.html
+++ b/index.html
@@ -141,7 +141,7 @@ 

Table of Contents

any, include, invoke, pluck, max, min, - sortBy, sortedIndex, + sortBy, groupBy, sortedIndex, toArray, size

@@ -437,6 +437,17 @@

Collection Functions (Arrays or Objects)

 _.sortBy([1, 2, 3, 4, 5, 6], function(num){ return Math.sin(num); });
 => [5, 4, 6, 3, 1, 2]
+
+ +

+ groupBy_.groupBy(list, iterator) +
+ Splits a collection into sets, grouped by the result of running each + value through iterator. +

+
+_.groupBy([1.3, 2.1, 2.4], function(num){ return Math.floor(num); });
+=> {1: [1.3], 2: [2.1, 2.4]}
 

diff --git a/test/collections.js b/test/collections.js index ff365f8ea..e1dc5ebfc 100644 --- a/test/collections.js +++ b/test/collections.js @@ -185,6 +185,12 @@ $(document).ready(function() { people = _.sortBy(people, function(person){ return person.age; }); equals(_.pluck(people, 'name').join(', '), 'moe, curly', 'stooges sorted by age'); }); + + test('collections: groupBy', function() { + var parity = _.groupBy([1, 2, 3, 4, 5, 6], function(num){ return num % 2; }); + equals(_.keys(parity).join(', '), '0, 1', 'created a group for each value'); + equals(parity[0].join(', '), '2, 4, 6', 'put each even number in the right group'); + }) test('collections: sortedIndex', function() { var numbers = [10, 20, 30, 40, 50], num = 35; diff --git a/underscore.js b/underscore.js index eaba008c4..468c06a9e 100644 --- a/underscore.js +++ b/underscore.js @@ -250,6 +250,21 @@ return a < b ? -1 : a > b ? 1 : 0; }), 'value'); }; + + // Groups the object's values by a criterion produced by an iterator + _.groupBy = function(obj, iterator) { + var result = {}; + each(obj, function(value) { + var key = iterator(value); + if (result.hasOwnProperty(key)) { + result[key].push(value); + } + else { + result[key] = [value]; + } + }); + return result; + } // Use a comparator function to figure out at what index an object should // be inserted so as to maintain order. Uses binary search. From b75e48c0575184680b545927775c200c84557b3e Mon Sep 17 00:00:00 2001 From: Andrei Date: Thu, 5 May 2011 14:31:40 -0400 Subject: [PATCH 04/36] cleaned up key check in groupBy --- underscore.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/underscore.js b/underscore.js index 468c06a9e..cbcd476e4 100644 --- a/underscore.js +++ b/underscore.js @@ -256,12 +256,7 @@ var result = {}; each(obj, function(value) { var key = iterator(value); - if (result.hasOwnProperty(key)) { - result[key].push(value); - } - else { - result[key] = [value]; - } + (result[key] || (result[key] = [])).push(value) }); return result; } From 1681d250635d099fe2d7d88e275322eecb0699af Mon Sep 17 00:00:00 2001 From: Andrei Date: Thu, 5 May 2011 14:43:28 -0400 Subject: [PATCH 05/36] in groupBy, also pass index to iterator. --- underscore.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/underscore.js b/underscore.js index cbcd476e4..a0ad75eec 100644 --- a/underscore.js +++ b/underscore.js @@ -254,8 +254,8 @@ // Groups the object's values by a criterion produced by an iterator _.groupBy = function(obj, iterator) { var result = {}; - each(obj, function(value) { - var key = iterator(value); + each(obj, function(value, index) { + var key = iterator(value, index); (result[key] || (result[key] = [])).push(value) }); return result; From 6846d71f88417905ab0284e89f15e0b0a140ad2c Mon Sep 17 00:00:00 2001 From: shinuza Date: Sat, 7 May 2011 11:24:05 +0200 Subject: [PATCH 06/36] Fixing _.any returning an incorrect result when Array.prototype.some is missing but Array.prototype.forEach exists. --- underscore.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/underscore.js b/underscore.js index a0ad75eec..1119eb400 100644 --- a/underscore.js +++ b/underscore.js @@ -186,7 +186,10 @@ if (obj == null) return result; if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context); each(obj, function(value, index, list) { - if (result = iterator.call(context, value, index, list)) return breaker; + if (iterator.call(context, value, index, list)) { + result = true; + return breaker; + } }); return result; }; From 899000c21771120933e914da14ab8b2279a0d424 Mon Sep 17 00:00:00 2001 From: shinuza Date: Sat, 7 May 2011 12:03:02 +0200 Subject: [PATCH 07/36] Hashmap keys are not necessarily ordered. groupBy test may fail if the expected order is not correct. Fixing this by checking if the keys are present in the hash so the order is not deterministic. --- test/collections.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/collections.js b/test/collections.js index e1dc5ebfc..1ca9d5de2 100644 --- a/test/collections.js +++ b/test/collections.js @@ -188,9 +188,9 @@ $(document).ready(function() { test('collections: groupBy', function() { var parity = _.groupBy([1, 2, 3, 4, 5, 6], function(num){ return num % 2; }); - equals(_.keys(parity).join(', '), '0, 1', 'created a group for each value'); + ok('0' in parity && '1' in parity, 'created a group for each value'); equals(parity[0].join(', '), '2, 4, 6', 'put each even number in the right group'); - }) + }); test('collections: sortedIndex', function() { var numbers = [10, 20, 30, 40, 50], num = 35; From 5141a51298c0c4ef02219ec404736a425ebf3da9 Mon Sep 17 00:00:00 2001 From: shinuza Date: Sat, 7 May 2011 16:29:43 +0200 Subject: [PATCH 08/36] Refactored fix as suggested in https://github.com/documentcloud/underscore/issues/177 --- underscore.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/underscore.js b/underscore.js index 1119eb400..d007edf57 100644 --- a/underscore.js +++ b/underscore.js @@ -180,19 +180,16 @@ // Determine if at least one element in the object matches a truth test. // Delegates to **ECMAScript 5**'s native `some` if available. // Aliased as `any`. - var any = _.some = _.any = function(obj, iterator, context) { - iterator || (iterator = _.identity); + var any = _.some = _.any = function (obj, iterator, context) { + iterator = iterator || _.identity; var result = false; if (obj == null) return result; if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context); - each(obj, function(value, index, list) { - if (iterator.call(context, value, index, list)) { - result = true; - return breaker; - } + each(obj, function (value, index, list) { + if (result |= iterator.call(context, value, index, list)) return breaker; }); - return result; - }; + return !!result; + } // Determine if a given value is included in the array or object using `===`. // Aliased as `contains`. From 72c5558471000615d17a9e744684ac20453ab77e Mon Sep 17 00:00:00 2001 From: Dustin Diaz Date: Tue, 10 May 2011 23:09:26 -0700 Subject: [PATCH 09/36] set "_" extern for use with Closure Compilers ADVANCED_OPTIMIZATIONS --- underscore.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/underscore.js b/underscore.js index a0ad75eec..f7505825a 100644 --- a/underscore.js +++ b/underscore.js @@ -55,7 +55,7 @@ module.exports = _; _._ = _; } else { - root._ = _; + root['_'] = _; } // Current version. @@ -250,7 +250,7 @@ return a < b ? -1 : a > b ? 1 : 0; }), 'value'); }; - + // Groups the object's values by a criterion produced by an iterator _.groupBy = function(obj, iterator) { var result = {}; From 057da5bc82f823562f7642f19bd8d2dce58c2907 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Wed, 11 May 2011 10:27:52 -0400 Subject: [PATCH 10/36] Issue #202 ... fallback method for sparse arrays. --- test/collections.js | 6 +----- underscore.js | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/test/collections.js b/test/collections.js index 1ca9d5de2..32a1ee1bf 100644 --- a/test/collections.js +++ b/test/collections.js @@ -26,10 +26,6 @@ $(document).ready(function() { _.each([1, 2, 3], function(num, index, arr){ if (_.include(arr, num)) answer = true; }); ok(answer, 'can reference the original collection from inside the iterator'); - answers = []; - _.each({range : 1, speed : 2, length : 3}, function(v){ answers.push(v); }); - ok(answers.join(', '), '1, 2, 3', 'can iterate over objects with numeric length properties'); - answers = 0; _.each(null, function(){ ++answers; }); equals(answers, 0, 'handles a null properly'); @@ -185,7 +181,7 @@ $(document).ready(function() { people = _.sortBy(people, function(person){ return person.age; }); equals(_.pluck(people, 'name').join(', '), 'moe, curly', 'stooges sorted by age'); }); - + test('collections: groupBy', function() { var parity = _.groupBy([1, 2, 3, 4, 5, 6], function(num){ return num % 2; }); ok('0' in parity && '1' in parity, 'created a group for each value'); diff --git a/underscore.js b/underscore.js index a0ad75eec..2aa216835 100644 --- a/underscore.js +++ b/underscore.js @@ -73,7 +73,7 @@ obj.forEach(iterator, context); } else if (_.isNumber(obj.length)) { for (var i = 0, l = obj.length; i < l; i++) { - if (iterator.call(context, obj[i], i, obj) === breaker) return; + if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return; } } else { for (var key in obj) { @@ -250,7 +250,7 @@ return a < b ? -1 : a > b ? 1 : 0; }), 'value'); }; - + // Groups the object's values by a criterion produced by an iterator _.groupBy = function(obj, iterator) { var result = {}; @@ -512,7 +512,7 @@ var funcs = slice.call(arguments); return function() { var args = slice.call(arguments); - for (var i=funcs.length-1; i >= 0; i--) { + for (var i = funcs.length - 1; i >= 0; i--) { args = [funcs[i].apply(this, args)]; } return args[0]; From 910af6797ffd9197f54bce2c41735e88023f3dfd Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Wed, 11 May 2011 11:00:15 -0400 Subject: [PATCH 11/36] Fixing #185 --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index f0c754728..9cbc3a0a7 100644 --- a/index.html +++ b/index.html @@ -431,8 +431,8 @@

Collection Functions (Arrays or Objects)

sortBy_.sortBy(list, iterator, [context])
- Returns a sorted list, ranked by the results of running each - value through iterator. + Returns a sorted copy of list, ranked by the results of running + each value through iterator.

 _.sortBy([1, 2, 3, 4, 5, 6], function(num){ return Math.sin(num); });

From 1331d814f9f27e45feefd8ca4f5ca4fd09391160 Mon Sep 17 00:00:00 2001
From: Jeremy Ashkenas 
Date: Wed, 11 May 2011 11:02:51 -0400
Subject: [PATCH 12/36] re-adding underscore-min.js to master

---
 .npmignore        |  1 -
 underscore-min.js | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 underscore-min.js

diff --git a/.npmignore b/.npmignore
index f5717584f..2ce268489 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,4 +1,3 @@
 test/
-underscore-min.js
 Rakefile
 docs/
\ No newline at end of file
diff --git a/underscore-min.js b/underscore-min.js
new file mode 100644
index 000000000..54bd0649f
--- /dev/null
+++ b/underscore-min.js
@@ -0,0 +1,26 @@
+// Underscore.js 1.1.6
+// (c) 2011 Jeremy Ashkenas, DocumentCloud Inc.
+// Underscore is freely distributable under the MIT license.
+// Portions of Underscore are inspired or borrowed from Prototype,
+// Oliver Steele's Functional, and John Resig's Micro-Templating.
+// For all details and documentation:
+// http://documentcloud.github.com/underscore
+(function(){var p=this,C=p._,m={},i=Array.prototype,n=Object.prototype,f=i.slice,D=i.unshift,E=n.toString,l=n.hasOwnProperty,s=i.forEach,t=i.map,u=i.reduce,v=i.reduceRight,w=i.filter,x=i.every,y=i.some,o=i.indexOf,z=i.lastIndexOf;n=Array.isArray;var F=Object.keys,q=Function.prototype.bind,b=function(a){return new j(a)};typeof module!=="undefined"&&module.exports?(module.exports=b,b._=b):p._=b;b.VERSION="1.1.6";var h=b.each=b.forEach=function(a,c,d){if(a!=null)if(s&&a.forEach===s)a.forEach(c,d);else if(b.isNumber(a.length))for(var e=
+0,k=a.length;e=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,
+c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);var e={computed:Infinity};h(a,function(a,b,f){b=c?c.call(d,a,b,f):a;bd?1:0}),"value")};b.groupBy=function(a,b){var d={};h(a,function(a,f){var g=b(a,f);(d[g]||(d[g]=[])).push(a)});return d};b.sortedIndex=function(a,c,d){d||
+(d=b.identity);for(var e=0,f=a.length;e>1;d(a[g])=0})})};b.zip=function(){for(var a=f.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e=0;d--)b=[a[d].apply(this,b)];return b[0]}};b.after=function(a,b){return function(){if(--a<1)return b.apply(this,arguments)}};b.keys=F||function(a){if(a!==Object(a))throw new TypeError("Invalid object");
+var b=[],d;for(d in a)l.call(a,d)&&(b[b.length]=d);return b};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){return b.filter(b.keys(a),function(c){return b.isFunction(a[c])}).sort()};b.extend=function(a){h(f.call(arguments,1),function(b){for(var d in b)b[d]!==void 0&&(a[d]=b[d])});return a};b.defaults=function(a){h(f.call(arguments,1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return b.isArray(a)?a.slice():b.extend({},a)};
+b.tap=function(a,b){b(a);return a};b.isEqual=function(a,c){if(a===c)return!0;var d=typeof a;if(d!=typeof c)return!1;if(a==c)return!0;if(!a&&c||a&&!c)return!1;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual)return a.isEqual(c);if(b.isDate(a)&&b.isDate(c))return a.getTime()===c.getTime();if(b.isNaN(a)&&b.isNaN(c))return!1;if(b.isRegExp(a)&&b.isRegExp(c))return a.source===c.source&&a.global===c.global&&a.ignoreCase===c.ignoreCase&&a.multiline===c.multiline;if(d!=="object")return!1;if(a.length&&
+a.length!==c.length)return!1;d=b.keys(a);var e=b.keys(c);if(d.length!=e.length)return!1;for(var f in a)if(!(f in c)||!b.isEqual(a[f],c[f]))return!1;return!0};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(l.call(a,c))return!1;return!0};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=n||function(a){return E.call(a)==="[object Array]"};b.isArguments=function(a){return!(!a||!l.call(a,"callee"))};b.isFunction=function(a){return!(!a||!a.constructor||
+!a.call||!a.apply)};b.isString=function(a){return!!(a===""||a&&a.charCodeAt&&a.substr)};b.isNumber=function(a){return!!(a===0||a&&a.toExponential&&a.toFixed)};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===!0||a===!1};b.isDate=function(a){return!(!a||!a.getTimezoneOffset||!a.setUTCFullYear)};b.isRegExp=function(a){return!(!a||!a.test||!a.exec||!(a.ignoreCase||a.ignoreCase===!1))};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.noConflict=
+function(){p._=C;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e/g,interpolate:/<%=([\s\S]+?)%>/g};b.template=function(a,c){var d=b.templateSettings;d="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(d.interpolate,
+function(a,b){return"',"+b.replace(/\\'/g,"'")+",'"}).replace(d.evaluate||null,function(a,b){return"');"+b.replace(/\\'/g,"'").replace(/[\r\n\t]/g," ")+"__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');";d=new Function("obj",d);return c?d(c):d};var j=function(a){this._wrapped=a};b.prototype=j.prototype;var r=function(a,c){return c?b(a).chain():a},H=function(a,c){j.prototype[a]=function(){var a=f.call(arguments);D.call(a,this._wrapped);return r(c.apply(b,
+a),this._chain)}};b.mixin(b);h(["pop","push","reverse","shift","sort","splice","unshift"],function(a){var b=i[a];j.prototype[a]=function(){b.apply(this._wrapped,arguments);return r(this._wrapped,this._chain)}});h(["concat","join","slice"],function(a){var b=i[a];j.prototype[a]=function(){return r(b.apply(this._wrapped,arguments),this._chain)}});j.prototype.chain=function(){this._chain=!0;return this};j.prototype.value=function(){return this._wrapped}})();

From bf6098f986450dad312a8ceacd3c02415e93f722 Mon Sep 17 00:00:00 2001
From: Jeremy Ashkenas 
Date: Wed, 11 May 2011 13:08:59 -0400
Subject: [PATCH 13/36] closure-compiler comment, plus semicolons.

---
 underscore.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/underscore.js b/underscore.js
index 1688e42fa..84fc889ee 100644
--- a/underscore.js
+++ b/underscore.js
@@ -55,6 +55,7 @@
     module.exports = _;
     _._ = _;
   } else {
+    // Exported as a string, for Closure Compiler "advanced" mode.
     root['_'] = _;
   }
 
@@ -256,10 +257,10 @@
     var result = {};
     each(obj, function(value, index) {
       var key = iterator(value, index);
-      (result[key] || (result[key] = [])).push(value)
+      (result[key] || (result[key] = [])).push(value);
     });
     return result;
-  }
+  };
 
   // Use a comparator function to figure out at what index an object should
   // be inserted so as to maintain order. Uses binary search.

From cf6cc16f4308a7055bff8140f3fe33518c01ffd7 Mon Sep 17 00:00:00 2001
From: Jeremy Ashkenas 
Date: Fri, 13 May 2011 17:09:15 -0400
Subject: [PATCH 14/36] Issue #207 -- add Data.js to the docs.

---
 index.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/index.html b/index.html
index 9cbc3a0a7..8e73aba63 100644
--- a/index.html
+++ b/index.html
@@ -1245,6 +1245,11 @@ 

Links & Suggested Reading

Functional JavaScript, which includes comprehensive higher-order function support as well as string lambdas.

+ +

+ Michael Aufreiter's Data.js, + a data manipulation + persistence library for JavaScript. +

Python's itertools. From 40af1652ebb1b07ae1dc7e754e9872b1db5a5a5f Mon Sep 17 00:00:00 2001 From: shinuza Date: Fri, 20 May 2011 09:13:58 +0200 Subject: [PATCH 15/36] Modified any/some test case to demonstrate issue #177 Fixed any/some formatting to be consistent with the rest of underscore.js --- test/collections.js | 3 +++ underscore.js | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/collections.js b/test/collections.js index e1dc5ebfc..91027f217 100644 --- a/test/collections.js +++ b/test/collections.js @@ -132,12 +132,15 @@ $(document).ready(function() { }); test('collections: any', function() { + var nativeSome = Array.prototype.some; + Array.prototype.some = null; ok(!_.any([]), 'the empty set'); ok(!_.any([false, false, false]), 'all false values'); ok(_.any([false, false, true]), 'one true value'); ok(!_.any([1, 11, 29], function(num){ return num % 2 == 0; }), 'all odd numbers'); ok(_.any([1, 10, 29], function(num){ return num % 2 == 0; }), 'an even number'); ok(_.some([false, false, true]), 'aliased as "some"'); + Array.prototype.some = nativeSome; }); test('collections: include', function() { diff --git a/underscore.js b/underscore.js index d007edf57..5c707e99f 100644 --- a/underscore.js +++ b/underscore.js @@ -186,10 +186,10 @@ if (obj == null) return result; if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context); each(obj, function (value, index, list) { - if (result |= iterator.call(context, value, index, list)) return breaker; + if (result |= iterator.call(context, value, index, list)) return breaker; }); return !!result; - } + }; // Determine if a given value is included in the array or object using `===`. // Aliased as `contains`. From 42487bf47dff4b0732977af2c6297b67ecec70af Mon Sep 17 00:00:00 2001 From: Dmitry Baranovskiy Date: Tue, 7 Jun 2011 09:48:34 +1000 Subject: [PATCH 16/36] Fixed isEqual if second object has isEqual implemented and added isObject method --- test/objects.js | 17 +++++++++++++++++ underscore.js | 6 ++++++ 2 files changed, 23 insertions(+) diff --git a/test/objects.js b/test/objects.js index 93c441176..48971c079 100644 --- a/test/objects.js +++ b/test/objects.js @@ -77,6 +77,8 @@ $(document).ready(function() { ok(_.isEqual(new Date(100), new Date(100)), 'identical dates are equal'); ok(_.isEqual((/hello/ig), (/hello/ig)), 'identical regexes are equal'); ok(!_.isEqual(null, [1]), 'a falsy is never equal to a truthy'); + ok(_.isEqual({isEqual: function () { return true; }}, {}), 'first object implements `isEqual`'); + ok(_.isEqual({}, {isEqual: function () { return true; }}), 'second object implements `isEqual`'); ok(!_.isEqual({x: 1, y: undefined}, {x: 1, z: 2}), 'objects with the same number of undefined keys are not equal'); ok(!_.isEqual(_({x: 1, y: undefined}).chain(), _({x: 1, z: 2}).chain()), 'wrapped objects are not equal'); equals(_({x: 1, y: 2}).chain().isEqual(_({x: 1, y: 2}).chain()).value(), true, 'wrapped objects are equal'); @@ -136,6 +138,21 @@ $(document).ready(function() { ok(_.isArguments(iArguments), 'even from another frame'); }); + test("objects: isObject", function() { + ok(_.isObject(arguments), 'the arguments object is object'); + ok(_.isObject([1, 2, 3]), 'and arrays'); + ok(_.isObject($('html')[0]), 'and DOM element'); + ok(_.isObject(iElement), 'even from another frame'); + ok(_.isObject(function () {}), 'and functions'); + ok(_.isObject(iFunction), 'even from another frame'); + ok(!_.isObject(null), 'but not null'); + ok(!_.isObject(undefined), 'and not undefined'); + ok(!_.isObject('string'), 'and not string'); + ok(!_.isObject(12), 'and not number'); + ok(!_.isObject(true), 'and not boolean'); + ok(_.isObject(new String('string')), 'but new String()'); + }); + test("objects: isArray", function() { ok(!_.isArray(arguments), 'the arguments object is not an array'); ok(_.isArray([1, 2, 3]), 'but arrays are'); diff --git a/underscore.js b/underscore.js index 84fc889ee..61fdb6ed5 100644 --- a/underscore.js +++ b/underscore.js @@ -600,6 +600,7 @@ if (b._chain) b = b._wrapped; // One of them implements an isEqual()? if (a.isEqual) return a.isEqual(b); + if (b.isEqual) return b.isEqual(a); // Check dates' integer values. if (_.isDate(a) && _.isDate(b)) return a.getTime() === b.getTime(); // Both are NaN? @@ -641,6 +642,11 @@ return toString.call(obj) === '[object Array]'; }; + // Is a given variable an object? + _.isObject = function(obj) { + return obj === Object(obj); + }; + // Is a given variable an arguments object? _.isArguments = function(obj) { return !!(obj && hasOwnProperty.call(obj, 'callee')); From b949d0345f11f67310cc06ff72a926f7814942a3 Mon Sep 17 00:00:00 2001 From: Cat Chen Date: Mon, 20 Jun 2011 22:30:35 +0800 Subject: [PATCH 17/36] updated _.delay test to use setTimeout to verify _.delay's behavior --- test/functions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/functions.js b/test/functions.js index 95267e73a..2a1bd51bd 100644 --- a/test/functions.js +++ b/test/functions.js @@ -73,8 +73,8 @@ $(document).ready(function() { asyncTest("functions: delay", 2, function() { var delayed = false; _.delay(function(){ delayed = true; }, 100); - _.delay(function(){ ok(!delayed, "didn't delay the function quite yet"); }, 50); - _.delay(function(){ ok(delayed, 'delayed the function'); start(); }, 150); + setTimeout(function(){ ok(!delayed, "didn't delay the function quite yet"); }, 50); + setTimeout(function(){ ok(delayed, 'delayed the function'); start(); }, 150); }); asyncTest("functions: defer", 1, function() { From 0202f9f79b882723e3aa19598cc31492c07c3096 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 21 Jun 2011 18:31:40 +0200 Subject: [PATCH 18/36] make toArray return a clone in case of an array In combination with backbone this makes coll.toArray() return an array instead of just returning coll.models, enabling coll.remove(coll.toArray()) whithout failing half way through. --- test/collections.js | 3 +++ underscore.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test/collections.js b/test/collections.js index 32a1ee1bf..912abaf26 100644 --- a/test/collections.js +++ b/test/collections.js @@ -197,6 +197,9 @@ $(document).ready(function() { test('collections: toArray', function() { ok(!_.isArray(arguments), 'arguments object is not an array'); ok(_.isArray(_.toArray(arguments)), 'arguments object converted into array'); + var a = [1,2,3]; + ok(_.toArray(a) !== a, 'array is cloned'); + equals(_.toArray(a).join(', '), '1, 2, 3', 'cloned array contains same elements'); var numbers = _.toArray({one : 1, two : 2, three : 3}); equals(numbers.join(', '), '1, 2, 3', 'object flattened into array'); diff --git a/underscore.js b/underscore.js index 61fdb6ed5..804a005e2 100644 --- a/underscore.js +++ b/underscore.js @@ -278,7 +278,7 @@ _.toArray = function(iterable) { if (!iterable) return []; if (iterable.toArray) return iterable.toArray(); - if (_.isArray(iterable)) return iterable; + if (_.isArray(iterable)) return slice.call(iterable); if (_.isArguments(iterable)) return slice.call(iterable); return _.values(iterable); }; From 9ab3ac44bbb39d21bb0ec1334fe9901e5b3f42bc Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 25 Jun 2011 09:01:51 +0200 Subject: [PATCH 19/36] move underscore test into a div more comfortable to include underscore with tests in some other project. --- test/collections.js | 2 +- test/test.html | 35 ++++++++++++++++++----------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/test/collections.js b/test/collections.js index 912abaf26..9a4d49ec4 100644 --- a/test/collections.js +++ b/test/collections.js @@ -41,7 +41,7 @@ $(document).ready(function() { var doubled = _([1, 2, 3]).map(function(num){ return num * 2; }); equals(doubled.join(', '), '2, 4, 6', 'OO-style doubled numbers'); - var ids = _.map(document.body.childNodes, function(n){ return n.id; }); + var ids = _.map($('div.underscore-test').children(), function(n){ return n.id; }); ok(_.include(ids, 'qunit-header'), 'can use collection methods on NodeLists'); var ids = _.map(document.images, function(n){ return n.id; }); diff --git a/test/test.html b/test/test.html index c67acf596..f8609aa26 100644 --- a/test/test.html +++ b/test/test.html @@ -16,26 +16,27 @@ -

Underscore Test Suite

-

-

-
    -
    -

    Underscore Speed Suite

    -

    - A representative sample of the functions are benchmarked here, to provide - a sense of how fast they might run in different browsers. - Each iteration runs on an array of 1000 elements.

    - For example, the 'intersect' test measures the number of times you can - find the intersection of two thousand-element arrays in one second. -

    -
    +
    +

    Underscore Test Suite

    +

    +

    +
      +
      +

      Underscore Speed Suite

      +

      + A representative sample of the functions are benchmarked here, to provide + a sense of how fast they might run in different browsers. + Each iteration runs on an array of 1000 elements.

      + For example, the 'intersect' test measures the number of times you can + find the intersection of two thousand-element arrays in one second. +

      +
      - - + +
      From 5eaf71f1013a554b08e6b7cd540fa5be7f594835 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Tue, 12 Jul 2011 15:22:39 -0400 Subject: [PATCH 20/36] removing somewhat silly isNumber check. --- underscore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/underscore.js b/underscore.js index 804a005e2..43502f328 100644 --- a/underscore.js +++ b/underscore.js @@ -72,7 +72,7 @@ if (obj == null) return; if (nativeForEach && obj.forEach === nativeForEach) { obj.forEach(iterator, context); - } else if (_.isNumber(obj.length)) { + } else if (obj.length) { for (var i = 0, l = obj.length; i < l; i++) { if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return; } From fbae682e8fa29c7e4e2fb2c74ed98e81ac11284b Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Tue, 12 Jul 2011 15:23:23 -0400 Subject: [PATCH 21/36] fixing comment for #239 --- underscore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/underscore.js b/underscore.js index 43502f328..0ae93fb4a 100644 --- a/underscore.js +++ b/underscore.js @@ -66,7 +66,7 @@ // -------------------- // The cornerstone, an `each` implementation, aka `forEach`. - // Handles objects implementing `forEach`, arrays, and raw objects. + // Handles objects with the built-in `forEach`, arrays, and raw objects. // Delegates to **ECMAScript 5**'s native `forEach` if available. var each = _.each = _.forEach = function(obj, iterator, context) { if (obj == null) return; From 942d63129b5e7490bdcd53ae1172938ca5764ec9 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Tue, 12 Jul 2011 15:27:42 -0400 Subject: [PATCH 22/36] Fixing silly commit. Thanks @cirwin --- underscore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/underscore.js b/underscore.js index 0ae93fb4a..66e71fc3f 100644 --- a/underscore.js +++ b/underscore.js @@ -72,7 +72,7 @@ if (obj == null) return; if (nativeForEach && obj.forEach === nativeForEach) { obj.forEach(iterator, context); - } else if (obj.length) { + } else if (obj.length || obj.length === 0) { for (var i = 0, l = obj.length; i < l; i++) { if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return; } From 0ec859a142d2eb255b561c18f9d2598c589d95e6 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Tue, 12 Jul 2011 16:48:30 -0400 Subject: [PATCH 23/36] Issue #225, adding _.union, _.difference, to complement _.without and _.intersection. --- test/arrays.js | 18 ++++++++++++++---- underscore.js | 19 +++++++++++++++---- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/test/arrays.js b/test/arrays.js index e031afe9b..32dd73a55 100644 --- a/test/arrays.js +++ b/test/arrays.js @@ -65,14 +65,24 @@ $(document).ready(function() { equals(result.join(', '), '1, 2, 3, 4', 'works on an arguments object'); }); - test("arrays: intersect", function() { + test("arrays: intersection", function() { var stooges = ['moe', 'curly', 'larry'], leaders = ['moe', 'groucho']; - equals(_.intersect(stooges, leaders).join(''), 'moe', 'can take the set intersection of two arrays'); - equals(_(stooges).intersect(leaders).join(''), 'moe', 'can perform an OO-style intersection'); - var result = (function(){ return _.intersect(arguments, leaders); })('moe', 'curly', 'larry'); + equals(_.intersection(stooges, leaders).join(''), 'moe', 'can take the set intersection of two arrays'); + equals(_(stooges).intersection(leaders).join(''), 'moe', 'can perform an OO-style intersection'); + var result = (function(){ return _.intersection(arguments, leaders); })('moe', 'curly', 'larry'); equals(result.join(''), 'moe', 'works on an arguments object'); }); + test("arrays: union", function() { + var result = _.union([1, 2, 3], [2, 30, 1], [1, 40]); + equals(result.join(' '), '1 2 3 30 40', 'takes the union of a list of arrays'); + }); + + test("arrays: difference", function() { + var result = _.difference([1, 2, 3], [2, 30, 40]); + equals(result.join(' '), '1 3', 'takes the difference of two arrays'); + }); + test('arrays: zip', function() { var names = ['moe', 'larry', 'curly'], ages = [30, 40, 50], leaders = [true]; var stooges = _.zip(names, ages, leaders); diff --git a/underscore.js b/underscore.js index 66e71fc3f..0ac287e8e 100644 --- a/underscore.js +++ b/underscore.js @@ -327,8 +327,7 @@ // Return a version of the array that does not contain the specified value(s). _.without = function(array) { - var values = slice.call(arguments, 1); - return _.filter(array, function(value){ return !_.include(values, value); }); + return _.difference(array, slice.call(arguments, 1)); }; // Produce a duplicate-free version of the array. If the array has already @@ -341,9 +340,15 @@ }, []); }; + // Produce an array that contains the union: each distinct element from all of + // the passed-in arrays. + _.union = function() { + return _.uniq(_.flatten(arguments)); + }; + // Produce an array that contains every item shared between all the - // passed-in arrays. - _.intersect = function(array) { + // passed-in arrays. (Aliased as "intersect" for back-compat.) + _.intersection = _.intersect = function(array) { var rest = slice.call(arguments, 1); return _.filter(_.uniq(array), function(item) { return _.every(rest, function(other) { @@ -352,6 +357,12 @@ }); }; + // Take the difference between one array and another. + // Only the elements present in just the first array will remain. + _.difference = function(array, other) { + return _.filter(array, function(value){ return !_.include(other, value); }); + }; + // Zip together multiple lists into a single array -- elements that share // an index go together. _.zip = function() { From 727db393d5ad2584d96941d8b69e0b651308b694 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Tue, 12 Jul 2011 17:01:04 -0400 Subject: [PATCH 24/36] Amending length check as discussed in 942d63 --- underscore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/underscore.js b/underscore.js index 0ac287e8e..5757609fa 100644 --- a/underscore.js +++ b/underscore.js @@ -72,7 +72,7 @@ if (obj == null) return; if (nativeForEach && obj.forEach === nativeForEach) { obj.forEach(iterator, context); - } else if (obj.length || obj.length === 0) { + } else if (obj.length === +obj.length) { for (var i = 0, l = obj.length; i < l; i++) { if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return; } From cd236d4c47d296d20ae606e8a33ccc25ccd1188e Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Wed, 13 Jul 2011 11:09:51 -0400 Subject: [PATCH 25/36] Issue #243. _.functions now also returns the names of function defined in the prototype chain. --- test/objects.js | 4 ++++ underscore.js | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/test/objects.js b/test/objects.js index 48971c079..78add1fed 100644 --- a/test/objects.js +++ b/test/objects.js @@ -22,6 +22,10 @@ $(document).ready(function() { test("objects: functions", function() { var obj = {a : 'dash', b : _.map, c : (/yo/), d : _.reduce}; ok(_.isEqual(['b', 'd'], _.functions(obj)), 'can grab the function names of any passed-in object'); + + var Animal = function(){}; + Animal.prototype.run = function(){}; + equals(_.functions(new Animal).join(''), 'run', 'also looks up functions on the prototype'); }); test("objects: extend", function() { diff --git a/underscore.js b/underscore.js index 5757609fa..9857159eb 100644 --- a/underscore.js +++ b/underscore.js @@ -559,7 +559,11 @@ // Return a sorted list of the function names available on the object. // Aliased as `methods` _.functions = _.methods = function(obj) { - return _.filter(_.keys(obj), function(key){ return _.isFunction(obj[key]); }).sort(); + var names = []; + for (var key in obj) { + if (_.isFunction(obj[key])) names.push(key); + } + return names.sort(); }; // Extend a given object with all the properties in passed-in object(s). From 174c897fced7bdfd4841103dcb53c468c79ffe37 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Wed, 13 Jul 2011 12:21:08 -0400 Subject: [PATCH 26/36] Issue #103, change initial value detection for reduce() --- underscore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/underscore.js b/underscore.js index 9857159eb..bf004d3ca 100644 --- a/underscore.js +++ b/underscore.js @@ -100,7 +100,7 @@ // **Reduce** builds up a single result from a list of values, aka `inject`, // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available. _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) { - var initial = memo !== void 0; + var initial = arguments.length > 2; if (obj == null) obj = []; if (nativeReduce && obj.reduce === nativeReduce) { if (context) iterator = _.bind(iterator, context); From 5edc3761c683e0f64688fa9f8dc3a156702b7241 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Wed, 13 Jul 2011 12:27:11 -0400 Subject: [PATCH 27/36] Issue #209, fix reduce without a memo for arrays that are sparse at the beginning. --- underscore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/underscore.js b/underscore.js index bf004d3ca..8a2a65622 100644 --- a/underscore.js +++ b/underscore.js @@ -107,7 +107,7 @@ return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator); } each(obj, function(value, index, list) { - if (!initial && index === 0) { + if (!initial) { memo = value; initial = true; } else { From 7573ac775110f333a344d41f3d6a485c90207261 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Wed, 13 Jul 2011 12:36:27 -0400 Subject: [PATCH 28/36] Unit tests for sparse arrays. --- test/collections.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/collections.js b/test/collections.js index 9a4d49ec4..a0ac266ac 100644 --- a/test/collections.js +++ b/test/collections.js @@ -77,6 +77,15 @@ $(document).ready(function() { ok(ifnull instanceof TypeError, 'handles a null (without inital value) properly'); ok(_.reduce(null, function(){}, 138) === 138, 'handles a null (with initial value) properly'); + + // Sparse arrays: + equals(_.reduce([], function(){}, undefined), undefined, 'undefined can be passed as a special case'); + + var sparseArray = []; + sparseArray[100] = 10; + sparseArray[200] = 20; + + equals(_.reduce(sparseArray, function(a, b){ return a + b }), 30, 'initially-sparse arrays with no memo'); }); test('collections: reduceRight', function() { From 347d7297f33107a25e892bd2e67b18d0d33c2454 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Wed, 13 Jul 2011 12:41:17 -0400 Subject: [PATCH 29/36] function formatting. --- underscore.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/underscore.js b/underscore.js index 9b550da51..f1206a030 100644 --- a/underscore.js +++ b/underscore.js @@ -181,12 +181,12 @@ // Determine if at least one element in the object matches a truth test. // Delegates to **ECMAScript 5**'s native `some` if available. // Aliased as `any`. - var any = _.some = _.any = function (obj, iterator, context) { + var any = _.some = _.any = function(obj, iterator, context) { iterator = iterator || _.identity; var result = false; if (obj == null) return result; if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context); - each(obj, function (value, index, list) { + each(obj, function(value, index, list) { if (result |= iterator.call(context, value, index, list)) return breaker; }); return !!result; From 19beb29283cf5cdcf1c4f4ff2140378a01d31ceb Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Wed, 13 Jul 2011 12:57:51 -0400 Subject: [PATCH 30/36] Revert "Issue #103, change initial value detection for reduce()" This reverts commit 174c897fced7bdfd4841103dcb53c468c79ffe37. --- underscore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/underscore.js b/underscore.js index f1206a030..41cd7ce2a 100644 --- a/underscore.js +++ b/underscore.js @@ -100,7 +100,7 @@ // **Reduce** builds up a single result from a list of values, aka `inject`, // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available. _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) { - var initial = arguments.length > 2; + var initial = memo !== void 0; if (obj == null) obj = []; if (nativeReduce && obj.reduce === nativeReduce) { if (context) iterator = _.bind(iterator, context); From 7eb7b08f7127d8fd4239312ae7c23b675484e8d3 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Wed, 13 Jul 2011 12:58:36 -0400 Subject: [PATCH 31/36] reverting a non-important change that broke reduceRight in IE. --- test/collections.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/collections.js b/test/collections.js index 719e6a1aa..005ee169e 100644 --- a/test/collections.js +++ b/test/collections.js @@ -79,8 +79,6 @@ $(document).ready(function() { ok(_.reduce(null, function(){}, 138) === 138, 'handles a null (with initial value) properly'); // Sparse arrays: - equals(_.reduce([], function(){}, undefined), undefined, 'undefined can be passed as a special case'); - var sparseArray = []; sparseArray[100] = 10; sparseArray[200] = 20; From 47fb3d7f9c2e9e743ce05fb073105e15ca15bfc3 Mon Sep 17 00:00:00 2001 From: limeblack Date: Wed, 13 Jul 2011 11:19:34 -0700 Subject: [PATCH 32/36] Edited underscore.js via GitHub --- underscore.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/underscore.js b/underscore.js index 41cd7ce2a..ed09b2f68 100644 --- a/underscore.js +++ b/underscore.js @@ -387,7 +387,8 @@ return array[i] === item ? i : -1; } if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item); - for (i = 0, l = array.length; i < l; i++) if (array[i] === item) return i; + var o,i=0; + while( o = array[i++] ) if (o === item) return i-1; return -1; }; From f099038a9d85116ea71c5c8914eb7eaa21a56e80 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Wed, 13 Jul 2011 15:12:50 -0400 Subject: [PATCH 33/36] merging in faster indexOf patch ... arguably faster than the native implementation, but oh well. #245 --- underscore.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/underscore.js b/underscore.js index ed09b2f68..a73ab93ba 100644 --- a/underscore.js +++ b/underscore.js @@ -381,14 +381,13 @@ // for **isSorted** to use binary search. _.indexOf = function(array, item, isSorted) { if (array == null) return -1; - var i, l; + var obj, i = 0; if (isSorted) { i = _.sortedIndex(array, item); return array[i] === item ? i : -1; } if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item); - var o,i=0; - while( o = array[i++] ) if (o === item) return i-1; + while (obj = array[i++]) if (obj === item) return i - 1; return -1; }; From a6cba6885e8494e205cf0eaa1c788033ad02e1d8 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Wed, 13 Jul 2011 15:57:42 -0400 Subject: [PATCH 34/36] Revert "merging in faster indexOf patch ... arguably faster than the native implementation, but oh well. #245" This reverts commit f099038a9d85116ea71c5c8914eb7eaa21a56e80. --- underscore.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/underscore.js b/underscore.js index a73ab93ba..ed09b2f68 100644 --- a/underscore.js +++ b/underscore.js @@ -381,13 +381,14 @@ // for **isSorted** to use binary search. _.indexOf = function(array, item, isSorted) { if (array == null) return -1; - var obj, i = 0; + var i, l; if (isSorted) { i = _.sortedIndex(array, item); return array[i] === item ? i : -1; } if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item); - while (obj = array[i++]) if (obj === item) return i - 1; + var o,i=0; + while( o = array[i++] ) if (o === item) return i-1; return -1; }; From c1a556216ed41b1adaeb65dc10efbf7a21569018 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Wed, 13 Jul 2011 15:57:52 -0400 Subject: [PATCH 35/36] Revert "Edited underscore.js via GitHub" This reverts commit 47fb3d7f9c2e9e743ce05fb073105e15ca15bfc3. --- underscore.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/underscore.js b/underscore.js index ed09b2f68..41cd7ce2a 100644 --- a/underscore.js +++ b/underscore.js @@ -387,8 +387,7 @@ return array[i] === item ? i : -1; } if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item); - var o,i=0; - while( o = array[i++] ) if (o === item) return i-1; + for (i = 0, l = array.length; i < l; i++) if (array[i] === item) return i; return -1; }; From 39b07d7b2cdbcf2f37b1239772ba58617f7c3650 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Wed, 13 Jul 2011 17:02:12 -0400 Subject: [PATCH 36/36] Underscore.js 1.1.7 --- docs/docco.css | 2 +- docs/underscore.html | 210 +++++++++++++++++++++++-------------------- index.html | 66 ++++++++++---- package.json | 2 +- underscore-min.js | 35 ++++---- underscore.js | 4 +- 6 files changed, 186 insertions(+), 133 deletions(-) diff --git a/docs/docco.css b/docs/docco.css index 20f2753d4..5aa0a8d73 100644 --- a/docs/docco.css +++ b/docs/docco.css @@ -115,7 +115,7 @@ table td { } pre, tt, code { font-size: 12px; line-height: 18px; - font-family: Menlo, Monaco, Consolas, "Lucida Console", monospace; + font-family: Monaco, Consolas, "Lucida Console", monospace; margin: 0; padding: 0; } diff --git a/docs/underscore.html b/docs/underscore.html index 4294e7be1..fdcf8166c 100644 --- a/docs/underscore.html +++ b/docs/underscore.html @@ -1,4 +1,4 @@ - underscore.js

      underscore.js

      Underscore.js 1.1.6
      +      underscore.js           

      underscore.js

      Underscore.js 1.1.7
       (c) 2011 Jeremy Ashkenas, DocumentCloud Inc.
       Underscore is freely distributable under the MIT license.
       Portions of Underscore are inspired or borrowed from Prototype,
      @@ -26,17 +26,16 @@
       global object.

        if (typeof module !== 'undefined' && module.exports) {
           module.exports = _;
           _._ = _;
      -  } else {
      -    root._ = _;
      -  }

      Current version.

        _.VERSION = '1.1.6';

      Collection Functions

      The cornerstone, an each implementation, aka forEach. -Handles objects implementing forEach, arrays, and raw objects. + } else {

      Exported as a string, for Closure Compiler "advanced" mode.

          root['_'] = _;
      +  }

      Current version.

        _.VERSION = '1.1.7';

      Collection Functions

      The cornerstone, an each implementation, aka forEach. +Handles objects with the built-in forEach, arrays, and raw objects. Delegates to ECMAScript 5's native forEach if available.

        var each = _.each = _.forEach = function(obj, iterator, context) {
           if (obj == null) return;
           if (nativeForEach && obj.forEach === nativeForEach) {
             obj.forEach(iterator, context);
      -    } else if (_.isNumber(obj.length)) {
      +    } else if (obj.length === +obj.length) {
             for (var i = 0, l = obj.length; i < l; i++) {
      -        if (iterator.call(context, obj[i], i, obj) === breaker) return;
      +        if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return;
             }
           } else {
             for (var key in obj) {
      @@ -45,7 +44,7 @@
               }
             }
           }
      -  };

      Return the results of applying the iterator to each element. + };

      Return the results of applying the iterator to each element. Delegates to ECMAScript 5's native map if available.

        _.map = function(obj, iterator, context) {
           var results = [];
           if (obj == null) return results;
      @@ -54,7 +53,7 @@
             results[results.length] = iterator.call(context, value, index, list);
           });
           return results;
      -  };

      Reduce builds up a single result from a list of values, aka inject, + };

      Reduce builds up a single result from a list of values, aka inject, or foldl. Delegates to ECMAScript 5's native reduce if available.

        _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
           var initial = memo !== void 0;
           if (obj == null) obj = [];
      @@ -63,7 +62,7 @@
             return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
           }
           each(obj, function(value, index, list) {
      -      if (!initial && index === 0) {
      +      if (!initial) {
               memo = value;
               initial = true;
             } else {
      @@ -72,7 +71,7 @@
           });
           if (!initial) throw new TypeError("Reduce of empty array with no initial value");
           return memo;
      -  };

      The right-associative version of reduce, also known as foldr. + };

      The right-associative version of reduce, also known as foldr. Delegates to ECMAScript 5's native reduceRight if available.

        _.reduceRight = _.foldr = function(obj, iterator, memo, context) {
           if (obj == null) obj = [];
           if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
      @@ -81,7 +80,7 @@
           }
           var reversed = (_.isArray(obj) ? obj.slice() : _.toArray(obj)).reverse();
           return _.reduce(reversed, iterator, memo, context);
      -  };

      Return the first value which passes a truth test. Aliased as detect.

        _.find = _.detect = function(obj, iterator, context) {
      +  };

      Return the first value which passes a truth test. Aliased as detect.

        _.find = _.detect = function(obj, iterator, context) {
           var result;
           any(obj, function(value, index, list) {
             if (iterator.call(context, value, index, list)) {
      @@ -90,7 +89,7 @@
             }
           });
           return result;
      -  };

      Return all the elements that pass a truth test. + };

      Return all the elements that pass a truth test. Delegates to ECMAScript 5's native filter if available. Aliased as select.

        _.filter = _.select = function(obj, iterator, context) {
           var results = [];
      @@ -100,14 +99,14 @@
             if (iterator.call(context, value, index, list)) results[results.length] = value;
           });
           return results;
      -  };

      Return all the elements for which a truth test fails.

        _.reject = function(obj, iterator, context) {
      +  };

      Return all the elements for which a truth test fails.

        _.reject = function(obj, iterator, context) {
           var results = [];
           if (obj == null) return results;
           each(obj, function(value, index, list) {
             if (!iterator.call(context, value, index, list)) results[results.length] = value;
           });
           return results;
      -  };

      Determine whether all of the elements match a truth test. + };

      Determine whether all of the elements match a truth test. Delegates to ECMAScript 5's native every if available. Aliased as all.

        _.every = _.all = function(obj, iterator, context) {
           var result = true;
      @@ -117,18 +116,18 @@
             if (!(result = result && iterator.call(context, value, index, list))) return breaker;
           });
           return result;
      -  };

      Determine if at least one element in the object matches a truth test. + };

      Determine if at least one element in the object matches a truth test. Delegates to ECMAScript 5's native some if available. Aliased as any.

        var any = _.some = _.any = function(obj, iterator, context) {
      -    iterator || (iterator = _.identity);
      +    iterator = iterator || _.identity;
           var result = false;
           if (obj == null) return result;
           if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context);
           each(obj, function(value, index, list) {
      -      if (result = iterator.call(context, value, index, list)) return breaker;
      +      if (result |= iterator.call(context, value, index, list)) return breaker;
           });
      -    return result;
      -  };

      Determine if a given value is included in the array or object using ===. + return !!result; + };

      Determine if a given value is included in the array or object using ===. Aliased as contains.

        _.include = _.contains = function(obj, target) {
           var found = false;
           if (obj == null) return found;
      @@ -137,14 +136,14 @@
             if (found = value === target) return true;
           });
           return found;
      -  };

      Invoke a method (with arguments) on every item in a collection.

        _.invoke = function(obj, method) {
      +  };

      Invoke a method (with arguments) on every item in a collection.

        _.invoke = function(obj, method) {
           var args = slice.call(arguments, 2);
           return _.map(obj, function(value) {
             return (method.call ? method || value : value[method]).apply(value, args);
           });
      -  };

      Convenience version of a common use case of map: fetching a property.

        _.pluck = function(obj, key) {
      +  };

      Convenience version of a common use case of map: fetching a property.

        _.pluck = function(obj, key) {
           return _.map(obj, function(value){ return value[key]; });
      -  };

      Return the maximum element or (element-based computation).

        _.max = function(obj, iterator, context) {
      +  };

      Return the maximum element or (element-based computation).

        _.max = function(obj, iterator, context) {
           if (!iterator && _.isArray(obj)) return Math.max.apply(Math, obj);
           var result = {computed : -Infinity};
           each(obj, function(value, index, list) {
      @@ -152,7 +151,7 @@
             computed >= result.computed && (result = {value : value, computed : computed});
           });
           return result.value;
      -  };

      Return the minimum element (or element-based computation).

        _.min = function(obj, iterator, context) {
      +  };

      Return the minimum element (or element-based computation).

        _.min = function(obj, iterator, context) {
           if (!iterator && _.isArray(obj)) return Math.min.apply(Math, obj);
           var result = {computed : Infinity};
           each(obj, function(value, index, list) {
      @@ -160,7 +159,7 @@
             computed < result.computed && (result = {value : value, computed : computed});
           });
           return result.value;
      -  };

      Sort the object's values by a criterion produced by an iterator.

        _.sortBy = function(obj, iterator, context) {
      +  };

      Sort the object's values by a criterion produced by an iterator.

        _.sortBy = function(obj, iterator, context) {
           return _.pluck(_.map(obj, function(value, index, list) {
             return {
               value : value,
      @@ -170,7 +169,14 @@
             var a = left.criteria, b = right.criteria;
             return a < b ? -1 : a > b ? 1 : 0;
           }), 'value');
      -  };

      Use a comparator function to figure out at what index an object should + };

      Groups the object's values by a criterion produced by an iterator

        _.groupBy = function(obj, iterator) {
      +    var result = {};
      +    each(obj, function(value, index) {
      +      var key = iterator(value, index);
      +      (result[key] || (result[key] = [])).push(value);
      +    });
      +    return result;
      +  };

      Use a comparator function to figure out at what index an object should be inserted so as to maintain order. Uses binary search.

        _.sortedIndex = function(array, obj, iterator) {
           iterator || (iterator = _.identity);
           var low = 0, high = array.length;
      @@ -179,59 +185,64 @@
             iterator(array[mid]) < iterator(obj) ? low = mid + 1 : high = mid;
           }
           return low;
      -  };

      Safely convert anything iterable into a real, live array.

        _.toArray = function(iterable) {
      +  };

      Safely convert anything iterable into a real, live array.

        _.toArray = function(iterable) {
           if (!iterable)                return [];
           if (iterable.toArray)         return iterable.toArray();
      -    if (_.isArray(iterable))      return iterable;
      +    if (_.isArray(iterable))      return slice.call(iterable);
           if (_.isArguments(iterable))  return slice.call(iterable);
           return _.values(iterable);
      -  };

      Return the number of elements in an object.

        _.size = function(obj) {
      +  };

      Return the number of elements in an object.

        _.size = function(obj) {
           return _.toArray(obj).length;
      -  };

      Array Functions

      Get the first element of an array. Passing n will return the first N + };

      Array Functions

      Get the first element of an array. Passing n will return the first N values in the array. Aliased as head. The guard check allows it to work with _.map.

        _.first = _.head = function(array, n, guard) {
           return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
      -  };

      Returns everything but the first entry of the array. Aliased as tail. + };

      Returns everything but the first entry of the array. Aliased as tail. Especially useful on the arguments object. Passing an index will return the rest of the values in the array from that index onward. The guard check allows it to work with _.map.

        _.rest = _.tail = function(array, index, guard) {
           return slice.call(array, (index == null) || guard ? 1 : index);
      -  };

      Get the last element of an array.

        _.last = function(array) {
      +  };

      Get the last element of an array.

        _.last = function(array) {
           return array[array.length - 1];
      -  };

      Trim out all falsy values from an array.

        _.compact = function(array) {
      +  };

      Trim out all falsy values from an array.

        _.compact = function(array) {
           return _.filter(array, function(value){ return !!value; });
      -  };

      Return a completely flattened version of an array.

        _.flatten = function(array) {
      +  };

      Return a completely flattened version of an array.

        _.flatten = function(array) {
           return _.reduce(array, function(memo, value) {
             if (_.isArray(value)) return memo.concat(_.flatten(value));
             memo[memo.length] = value;
             return memo;
           }, []);
      -  };

      Return a version of the array that does not contain the specified value(s).

        _.without = function(array) {
      -    var values = slice.call(arguments, 1);
      -    return _.filter(array, function(value){ return !_.include(values, value); });
      -  };

      Produce a duplicate-free version of the array. If the array has already + };

      Return a version of the array that does not contain the specified value(s).

        _.without = function(array) {
      +    return _.difference(array, slice.call(arguments, 1));
      +  };

      Produce a duplicate-free version of the array. If the array has already been sorted, you have the option of using a faster algorithm. Aliased as unique.

        _.uniq = _.unique = function(array, isSorted) {
           return _.reduce(array, function(memo, el, i) {
             if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) memo[memo.length] = el;
             return memo;
           }, []);
      -  };

      Produce an array that contains every item shared between all the -passed-in arrays.

        _.intersect = function(array) {
      +  };

      Produce an array that contains the union: each distinct element from all of +the passed-in arrays.

        _.union = function() {
      +    return _.uniq(_.flatten(arguments));
      +  };

      Produce an array that contains every item shared between all the +passed-in arrays. (Aliased as "intersect" for back-compat.)

        _.intersection = _.intersect = function(array) {
           var rest = slice.call(arguments, 1);
           return _.filter(_.uniq(array), function(item) {
             return _.every(rest, function(other) {
               return _.indexOf(other, item) >= 0;
             });
           });
      -  };

      Zip together multiple lists into a single array -- elements that share + };

      Take the difference between one array and another. +Only the elements present in just the first array will remain.

        _.difference = function(array, other) {
      +    return _.filter(array, function(value){ return !_.include(other, value); });
      +  };

      Zip together multiple lists into a single array -- elements that share an index go together.

        _.zip = function() {
           var args = slice.call(arguments);
           var length = _.max(_.pluck(args, 'length'));
           var results = new Array(length);
           for (var i = 0; i < length; i++) results[i] = _.pluck(args, "" + i);
           return results;
      -  };

      If the browser doesn't supply us with indexOf (I'm looking at you, MSIE), + };

      If the browser doesn't supply us with indexOf (I'm looking at you, MSIE), we need this function. Return the position of the first occurrence of an item in an array, or -1 if the item is not included in the array. Delegates to ECMAScript 5's native indexOf if available. @@ -246,13 +257,13 @@ if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item); for (i = 0, l = array.length; i < l; i++) if (array[i] === item) return i; return -1; - };

      Delegates to ECMAScript 5's native lastIndexOf if available.

        _.lastIndexOf = function(array, item) {
      +  };

      Delegates to ECMAScript 5's native lastIndexOf if available.

        _.lastIndexOf = function(array, item) {
           if (array == null) return -1;
           if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) return array.lastIndexOf(item);
           var i = array.length;
           while (i--) if (array[i] === item) return i;
           return -1;
      -  };

      Generate an integer Array containing an arithmetic progression. A port of + };

      Generate an integer Array containing an arithmetic progression. A port of the native Python range() function. See the Python documentation.

        _.range = function(start, stop, step) {
           if (arguments.length <= 1) {
      @@ -271,7 +282,7 @@
           }
       
           return range;
      -  };

      Function (ahem) Functions

      Create a function bound to a given object (assigning this, and arguments, + };

      Function (ahem) Functions

      Create a function bound to a given object (assigning this, and arguments, optionally). Binding with arguments is also known as curry. Delegates to ECMAScript 5's native Function.bind if available. We check for func.bind first, to fail fast when func is undefined.

        _.bind = function(func, obj) {
      @@ -280,27 +291,27 @@
           return function() {
             return func.apply(obj, args.concat(slice.call(arguments)));
           };
      -  };

      Bind all of an object's methods to that object. Useful for ensuring that + };

      Bind all of an object's methods to that object. Useful for ensuring that all callbacks defined on an object belong to it.

        _.bindAll = function(obj) {
           var funcs = slice.call(arguments, 1);
           if (funcs.length == 0) funcs = _.functions(obj);
           each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
           return obj;
      -  };

      Memoize an expensive function by storing its results.

        _.memoize = function(func, hasher) {
      +  };

      Memoize an expensive function by storing its results.

        _.memoize = function(func, hasher) {
           var memo = {};
           hasher || (hasher = _.identity);
           return function() {
             var key = hasher.apply(this, arguments);
             return hasOwnProperty.call(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments));
           };
      -  };

      Delays a function for the given number of milliseconds, and then calls + };

      Delays a function for the given number of milliseconds, and then calls it with the arguments supplied.

        _.delay = function(func, wait) {
           var args = slice.call(arguments, 2);
           return setTimeout(function(){ return func.apply(func, args); }, wait);
      -  };

      Defers a function, scheduling it to run after the current call stack has + };

      Defers a function, scheduling it to run after the current call stack has cleared.

        _.defer = function(func) {
           return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
      -  };

      Internal function used to implement _.throttle and _.debounce.

        var limit = function(func, wait, debounce) {
      +  };

      Internal function used to implement _.throttle and _.debounce.

        var limit = function(func, wait, debounce) {
           var timeout;
           return function() {
             var context = this, args = arguments;
      @@ -311,14 +322,14 @@
             if (debounce) clearTimeout(timeout);
             if (debounce || !timeout) timeout = setTimeout(throttler, wait);
           };
      -  };

      Returns a function, that, when invoked, will only be triggered at most once + };

      Returns a function, that, when invoked, will only be triggered at most once during a given window of time.

        _.throttle = function(func, wait) {
           return limit(func, wait, false);
      -  };

      Returns a function, that, as long as it continues to be invoked, will not + };

      Returns a function, that, as long as it continues to be invoked, will not be triggered. The function will be called after it stops being called for N milliseconds.

        _.debounce = function(func, wait) {
           return limit(func, wait, true);
      -  };

      Returns a function that will be executed at most one time, no matter how + };

      Returns a function that will be executed at most one time, no matter how often you call it. Useful for lazy initialization.

        _.once = function(func) {
           var ran = false, memo;
           return function() {
      @@ -326,120 +337,127 @@
             ran = true;
             return memo = func.apply(this, arguments);
           };
      -  };

      Returns the first function passed as an argument to the second, + };

      Returns the first function passed as an argument to the second, allowing you to adjust arguments, run code before and after, and conditionally execute the original function.

        _.wrap = function(func, wrapper) {
           return function() {
             var args = [func].concat(slice.call(arguments));
             return wrapper.apply(this, args);
           };
      -  };

      Returns a function that is the composition of a list of functions, each + };

      Returns a function that is the composition of a list of functions, each consuming the return value of the function that follows.

        _.compose = function() {
           var funcs = slice.call(arguments);
           return function() {
             var args = slice.call(arguments);
      -      for (var i=funcs.length-1; i >= 0; i--) {
      +      for (var i = funcs.length - 1; i >= 0; i--) {
               args = [funcs[i].apply(this, args)];
             }
             return args[0];
           };
      -  };

      Returns a function that will only be executed after being called N times.

        _.after = function(times, func) {
      +  };

      Returns a function that will only be executed after being called N times.

        _.after = function(times, func) {
           return function() {
             if (--times < 1) { return func.apply(this, arguments); }
           };
      -  };

      Object Functions

      Retrieve the names of an object's properties. + };

      Object Functions

      Retrieve the names of an object's properties. Delegates to ECMAScript 5's native Object.keys

        _.keys = nativeKeys || function(obj) {
           if (obj !== Object(obj)) throw new TypeError('Invalid object');
           var keys = [];
           for (var key in obj) if (hasOwnProperty.call(obj, key)) keys[keys.length] = key;
           return keys;
      -  };

      Retrieve the values of an object's properties.

        _.values = function(obj) {
      +  };

      Retrieve the values of an object's properties.

        _.values = function(obj) {
           return _.map(obj, _.identity);
      -  };

      Return a sorted list of the function names available on the object. + };

      Return a sorted list of the function names available on the object. Aliased as methods

        _.functions = _.methods = function(obj) {
      -    return _.filter(_.keys(obj), function(key){ return _.isFunction(obj[key]); }).sort();
      -  };

      Extend a given object with all the properties in passed-in object(s).

        _.extend = function(obj) {
      +    var names = [];
      +    for (var key in obj) {
      +      if (_.isFunction(obj[key])) names.push(key);
      +    }
      +    return names.sort();
      +  };

      Extend a given object with all the properties in passed-in object(s).

        _.extend = function(obj) {
           each(slice.call(arguments, 1), function(source) {
             for (var prop in source) {
               if (source[prop] !== void 0) obj[prop] = source[prop];
             }
           });
           return obj;
      -  };

      Fill in a given object with default properties.

        _.defaults = function(obj) {
      +  };

      Fill in a given object with default properties.

        _.defaults = function(obj) {
           each(slice.call(arguments, 1), function(source) {
             for (var prop in source) {
               if (obj[prop] == null) obj[prop] = source[prop];
             }
           });
           return obj;
      -  };

      Create a (shallow-cloned) duplicate of an object.

        _.clone = function(obj) {
      +  };

      Create a (shallow-cloned) duplicate of an object.

        _.clone = function(obj) {
           return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
      -  };

      Invokes interceptor with the obj, and then returns obj. + };

      Invokes interceptor with the obj, and then returns obj. The primary purpose of this method is to "tap into" a method chain, in order to perform operations on intermediate results within the chain.

        _.tap = function(obj, interceptor) {
           interceptor(obj);
           return obj;
      -  };

      Perform a deep comparison to check if two objects are equal.

        _.isEqual = function(a, b) {

      Check object identity.

          if (a === b) return true;

      Different types?

          var atype = typeof(a), btype = typeof(b);
      -    if (atype != btype) return false;

      Basic equality test (watch out for coercions).

          if (a == b) return true;

      One is falsy and the other truthy.

          if ((!a && b) || (a && !b)) return false;

      Unwrap any wrapped objects.

          if (a._chain) a = a._wrapped;
      -    if (b._chain) b = b._wrapped;

      One of them implements an isEqual()?

          if (a.isEqual) return a.isEqual(b);

      Check dates' integer values.

          if (_.isDate(a) && _.isDate(b)) return a.getTime() === b.getTime();

      Both are NaN?

          if (_.isNaN(a) && _.isNaN(b)) return false;

      Compare regular expressions.

          if (_.isRegExp(a) && _.isRegExp(b))
      +  };

      Perform a deep comparison to check if two objects are equal.

        _.isEqual = function(a, b) {

      Check object identity.

          if (a === b) return true;

      Different types?

          var atype = typeof(a), btype = typeof(b);
      +    if (atype != btype) return false;

      Basic equality test (watch out for coercions).

          if (a == b) return true;

      One is falsy and the other truthy.

          if ((!a && b) || (a && !b)) return false;

      Unwrap any wrapped objects.

          if (a._chain) a = a._wrapped;
      +    if (b._chain) b = b._wrapped;

      One of them implements an isEqual()?

          if (a.isEqual) return a.isEqual(b);
      +    if (b.isEqual) return b.isEqual(a);

      Check dates' integer values.

          if (_.isDate(a) && _.isDate(b)) return a.getTime() === b.getTime();

      Both are NaN?

          if (_.isNaN(a) && _.isNaN(b)) return false;

      Compare regular expressions.

          if (_.isRegExp(a) && _.isRegExp(b))
             return a.source     === b.source &&
                    a.global     === b.global &&
                    a.ignoreCase === b.ignoreCase &&
      -             a.multiline  === b.multiline;

      If a is not an object by this point, we can't handle it.

          if (atype !== 'object') return false;

      Check for different array lengths before comparing contents.

          if (a.length && (a.length !== b.length)) return false;

      Nothing else worked, deep compare the contents.

          var aKeys = _.keys(a), bKeys = _.keys(b);

      Different object sizes?

          if (aKeys.length != bKeys.length) return false;

      Recursive comparison of contents.

          for (var key in a) if (!(key in b) || !_.isEqual(a[key], b[key])) return false;
      +             a.multiline  === b.multiline;

      If a is not an object by this point, we can't handle it.

          if (atype !== 'object') return false;

      Check for different array lengths before comparing contents.

          if (a.length && (a.length !== b.length)) return false;

      Nothing else worked, deep compare the contents.

          var aKeys = _.keys(a), bKeys = _.keys(b);

      Different object sizes?

          if (aKeys.length != bKeys.length) return false;

      Recursive comparison of contents.

          for (var key in a) if (!(key in b) || !_.isEqual(a[key], b[key])) return false;
           return true;
      -  };

      Is a given array or object empty?

        _.isEmpty = function(obj) {
      +  };

      Is a given array or object empty?

        _.isEmpty = function(obj) {
           if (_.isArray(obj) || _.isString(obj)) return obj.length === 0;
           for (var key in obj) if (hasOwnProperty.call(obj, key)) return false;
           return true;
      -  };

      Is a given value a DOM element?

        _.isElement = function(obj) {
      +  };

      Is a given value a DOM element?

        _.isElement = function(obj) {
           return !!(obj && obj.nodeType == 1);
      -  };

      Is a given value an array? + };

      Is a given value an array? Delegates to ECMA5's native Array.isArray

        _.isArray = nativeIsArray || function(obj) {
           return toString.call(obj) === '[object Array]';
      -  };

      Is a given variable an arguments object?

        _.isArguments = function(obj) {
      +  };

      Is a given variable an object?

        _.isObject = function(obj) {
      +    return obj === Object(obj);
      +  };

      Is a given variable an arguments object?

        _.isArguments = function(obj) {
           return !!(obj && hasOwnProperty.call(obj, 'callee'));
      -  };

      Is a given value a function?

        _.isFunction = function(obj) {
      +  };

      Is a given value a function?

        _.isFunction = function(obj) {
           return !!(obj && obj.constructor && obj.call && obj.apply);
      -  };

      Is a given value a string?

        _.isString = function(obj) {
      +  };

      Is a given value a string?

        _.isString = function(obj) {
           return !!(obj === '' || (obj && obj.charCodeAt && obj.substr));
      -  };

      Is a given value a number?

        _.isNumber = function(obj) {
      +  };

      Is a given value a number?

        _.isNumber = function(obj) {
           return !!(obj === 0 || (obj && obj.toExponential && obj.toFixed));
      -  };

      Is the given value NaN? NaN happens to be the only value in JavaScript + };

      Is the given value NaN? NaN happens to be the only value in JavaScript that does not equal itself.

        _.isNaN = function(obj) {
           return obj !== obj;
      -  };

      Is a given value a boolean?

        _.isBoolean = function(obj) {
      +  };

      Is a given value a boolean?

        _.isBoolean = function(obj) {
           return obj === true || obj === false;
      -  };

      Is a given value a date?

        _.isDate = function(obj) {
      +  };

      Is a given value a date?

        _.isDate = function(obj) {
           return !!(obj && obj.getTimezoneOffset && obj.setUTCFullYear);
      -  };

      Is the given value a regular expression?

        _.isRegExp = function(obj) {
      +  };

      Is the given value a regular expression?

        _.isRegExp = function(obj) {
           return !!(obj && obj.test && obj.exec && (obj.ignoreCase || obj.ignoreCase === false));
      -  };

      Is a given value equal to null?

        _.isNull = function(obj) {
      +  };

      Is a given value equal to null?

        _.isNull = function(obj) {
           return obj === null;
      -  };

      Is a given variable undefined?

        _.isUndefined = function(obj) {
      +  };

      Is a given variable undefined?

        _.isUndefined = function(obj) {
           return obj === void 0;
      -  };

      Utility Functions

      Run Underscore.js in noConflict mode, returning the _ variable to its + };

      Utility Functions

      Run Underscore.js in noConflict mode, returning the _ variable to its previous owner. Returns a reference to the Underscore object.

        _.noConflict = function() {
           root._ = previousUnderscore;
           return this;
      -  };

      Keep the identity function around for default iterators.

        _.identity = function(value) {
      +  };

      Keep the identity function around for default iterators.

        _.identity = function(value) {
           return value;
      -  };

      Run a function n times.

        _.times = function (n, iterator, context) {
      +  };

      Run a function n times.

        _.times = function (n, iterator, context) {
           for (var i = 0; i < n; i++) iterator.call(context, i);
      -  };

      Add your own custom functions to the Underscore object, ensuring that + };

      Add your own custom functions to the Underscore object, ensuring that they're correctly added to the OOP wrapper as well.

        _.mixin = function(obj) {
           each(_.functions(obj), function(name){
             addToWrapper(name, _[name] = obj[name]);
           });
      -  };

      Generate a unique integer id (unique within the entire client session). + };

      Generate a unique integer id (unique within the entire client session). Useful for temporary DOM ids.

        var idCounter = 0;
         _.uniqueId = function(prefix) {
           var id = idCounter++;
           return prefix ? prefix + id : id;
      -  };

      By default, Underscore uses ERB-style template delimiters, change the + };

      By default, Underscore uses ERB-style template delimiters, change the following template settings to use alternative delimiters.

        _.templateSettings = {
           evaluate    : /<%([\s\S]+?)%>/g,
           interpolate : /<%=([\s\S]+?)%>/g
      -  };

      JavaScript micro-templating, similar to John Resig's implementation. + };

      JavaScript micro-templating, similar to John Resig's implementation. Underscore templating handles arbitrary delimiters, preserves whitespace, and correctly escapes quotes within interpolated code.

        _.template = function(str, data) {
           var c  = _.templateSettings;
      @@ -460,31 +478,31 @@
                + "');}return __p.join('');";
           var func = new Function('obj', tmpl);
           return data ? func(data) : func;
      -  };

      The OOP Wrapper

      If Underscore is called as a function, it returns a wrapped object that + };

      The OOP Wrapper

      If Underscore is called as a function, it returns a wrapped object that can be used OO-style. This wrapper holds altered versions of all the -underscore functions. Wrapped objects may be chained.

        var wrapper = function(obj) { this._wrapped = obj; };

      Expose wrapper.prototype as _.prototype

        _.prototype = wrapper.prototype;

      Helper function to continue chaining intermediate results.

        var result = function(obj, chain) {
      +underscore functions. Wrapped objects may be chained.

        var wrapper = function(obj) { this._wrapped = obj; };

      Expose wrapper.prototype as _.prototype

        _.prototype = wrapper.prototype;

      Helper function to continue chaining intermediate results.

        var result = function(obj, chain) {
           return chain ? _(obj).chain() : obj;
      -  };

      A method to easily add functions to the OOP wrapper.

        var addToWrapper = function(name, func) {
      +  };

      A method to easily add functions to the OOP wrapper.

        var addToWrapper = function(name, func) {
           wrapper.prototype[name] = function() {
             var args = slice.call(arguments);
             unshift.call(args, this._wrapped);
             return result(func.apply(_, args), this._chain);
           };
      -  };

      Add all of the Underscore functions to the wrapper object.

        _.mixin(_);

      Add all mutator Array functions to the wrapper.

        each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
      +  };

      Add all of the Underscore functions to the wrapper object.

        _.mixin(_);

      Add all mutator Array functions to the wrapper.

        each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
           var method = ArrayProto[name];
           wrapper.prototype[name] = function() {
             method.apply(this._wrapped, arguments);
             return result(this._wrapped, this._chain);
           };
      -  });

      Add all accessor Array functions to the wrapper.

        each(['concat', 'join', 'slice'], function(name) {
      +  });

      Add all accessor Array functions to the wrapper.

        each(['concat', 'join', 'slice'], function(name) {
           var method = ArrayProto[name];
           wrapper.prototype[name] = function() {
             return result(method.apply(this._wrapped, arguments), this._chain);
           };
      -  });

      Start chaining a wrapped Underscore object.

        wrapper.prototype.chain = function() {
      +  });

      Start chaining a wrapped Underscore object.

        wrapper.prototype.chain = function() {
           this._chain = true;
           return this;
      -  };

      Extracts the result from a wrapped and chained object.

        wrapper.prototype.value = function() {
      +  };

      Extracts the result from a wrapped and chained object.

        wrapper.prototype.value = function() {
           return this._wrapped;
         };
       
      diff --git a/index.html b/index.html
      index 8e73aba63..0641e9059 100644
      --- a/index.html
      +++ b/index.html
      @@ -118,11 +118,11 @@ 

      Downloads (Right-click, and u - - + + - +
      Development Version (1.1.6)27kb, Uncompressed with CommentsDevelopment Version (1.1.7)28kb, Uncompressed with Comments
      Production Version (1.1.6)Production Version (1.1.7) 3kb, Minified and Gzipped
      @@ -149,8 +149,9 @@

      Table of Contents

      Arrays
      first, rest, last, - compact, flatten, without, uniq, - intersect, zip, indexOf, + compact, flatten, without, + union, intersection, difference, + uniq, zip, indexOf, lastIndexOf, range

      @@ -557,28 +558,50 @@

      Array Functions

      => [2, 3, 4]

      -

      - uniq_.uniq(array, [isSorted]) - Alias: unique +

      + union_.union(*arrays)
      - Produces a duplicate-free version of the array, using === to test - object equality. If you know in advance that the array is sorted, - passing true for isSorted will run a much faster algorithm. + Computes the union of the passed-in arrays: the list of unique items, + in order, that are present in one or more of the arrays.

      -_.uniq([1, 2, 1, 3, 1, 4]);
      -=> [1, 2, 3, 4]
      +_.union([1, 2, 3], [101, 2, 1, 10], [2, 1]);
      +=> [1, 2, 3, 101, 10]
       
      -

      - intersect_.intersect(*arrays) +

      + intersection_.intersection(*arrays)
      Computes the list of values that are the intersection of all the arrays. Each value in the result is present in each of the arrays.

      -_.intersect([1, 2, 3], [101, 2, 1, 10], [2, 1]);
      +_.intersection([1, 2, 3], [101, 2, 1, 10], [2, 1]);
       => [1, 2]
      +
      + +

      + difference_.difference(array, other) +
      + Similar to without, but returns the values from array that + are not present in other. +

      +
      +_.difference([1, 2, 3, 4, 5], [5, 2, 10]);
      +=> [1, 3, 4]
      +
      + +

      + uniq_.uniq(array, [isSorted]) + Alias: unique +
      + Produces a duplicate-free version of the array, using === to test + object equality. If you know in advance that the array is sorted, + passing true for isSorted will run a much faster algorithm. +

      +
      +_.uniq([1, 2, 1, 3, 1, 4]);
      +=> [1, 2, 3, 4]
       

      @@ -1257,6 +1280,17 @@

      Links & Suggested Reading

      Change Log

      +

      + 1.1.7July 13, 2011
      + Added _.groupBy, which aggregates a collection into groups of like items. + Added _.untion and _.difference, to complement the + (re-named) _.intersection. + Various improvements for support of sparse arrays. + _.toArray now returns a clone, if directly passed an array. + _.functions now also returns the names of functions that are present + in the prototype chain. +

      +

      1.1.6April 18, 2011
      Added _.after, which will return a function that only runs after diff --git a/package.json b/package.json index 86c918592..08396c4d9 100644 --- a/package.json +++ b/package.json @@ -8,5 +8,5 @@ "dependencies" : [], "repository" : {"type": "git", "url": "git://github.com/documentcloud/underscore.git"}, "main" : "underscore.js", - "version" : "1.1.6" + "version" : "1.1.7" } diff --git a/underscore-min.js b/underscore-min.js index 54bd0649f..5983694cf 100644 --- a/underscore-min.js +++ b/underscore-min.js @@ -1,26 +1,27 @@ -// Underscore.js 1.1.6 +// Underscore.js 1.1.7 // (c) 2011 Jeremy Ashkenas, DocumentCloud Inc. // Underscore is freely distributable under the MIT license. // Portions of Underscore are inspired or borrowed from Prototype, // Oliver Steele's Functional, and John Resig's Micro-Templating. // For all details and documentation: // http://documentcloud.github.com/underscore -(function(){var p=this,C=p._,m={},i=Array.prototype,n=Object.prototype,f=i.slice,D=i.unshift,E=n.toString,l=n.hasOwnProperty,s=i.forEach,t=i.map,u=i.reduce,v=i.reduceRight,w=i.filter,x=i.every,y=i.some,o=i.indexOf,z=i.lastIndexOf;n=Array.isArray;var F=Object.keys,q=Function.prototype.bind,b=function(a){return new j(a)};typeof module!=="undefined"&&module.exports?(module.exports=b,b._=b):p._=b;b.VERSION="1.1.6";var h=b.each=b.forEach=function(a,c,d){if(a!=null)if(s&&a.forEach===s)a.forEach(c,d);else if(b.isNumber(a.length))for(var e= -0,k=a.length;e=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a, c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);var e={computed:Infinity};h(a,function(a,b,f){b=c?c.call(d,a,b,f):a;bd?1:0}),"value")};b.groupBy=function(a,b){var d={};h(a,function(a,f){var g=b(a,f);(d[g]||(d[g]=[])).push(a)});return d};b.sortedIndex=function(a,c,d){d|| -(d=b.identity);for(var e=0,f=a.length;e>1;d(a[g])=0})})};b.zip=function(){for(var a=f.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e=0;d--)b=[a[d].apply(this,b)];return b[0]}};b.after=function(a,b){return function(){if(--a<1)return b.apply(this,arguments)}};b.keys=F||function(a){if(a!==Object(a))throw new TypeError("Invalid object"); -var b=[],d;for(d in a)l.call(a,d)&&(b[b.length]=d);return b};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){return b.filter(b.keys(a),function(c){return b.isFunction(a[c])}).sort()};b.extend=function(a){h(f.call(arguments,1),function(b){for(var d in b)b[d]!==void 0&&(a[d]=b[d])});return a};b.defaults=function(a){h(f.call(arguments,1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return b.isArray(a)?a.slice():b.extend({},a)}; -b.tap=function(a,b){b(a);return a};b.isEqual=function(a,c){if(a===c)return!0;var d=typeof a;if(d!=typeof c)return!1;if(a==c)return!0;if(!a&&c||a&&!c)return!1;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual)return a.isEqual(c);if(b.isDate(a)&&b.isDate(c))return a.getTime()===c.getTime();if(b.isNaN(a)&&b.isNaN(c))return!1;if(b.isRegExp(a)&&b.isRegExp(c))return a.source===c.source&&a.global===c.global&&a.ignoreCase===c.ignoreCase&&a.multiline===c.multiline;if(d!=="object")return!1;if(a.length&& -a.length!==c.length)return!1;d=b.keys(a);var e=b.keys(c);if(d.length!=e.length)return!1;for(var f in a)if(!(f in c)||!b.isEqual(a[f],c[f]))return!1;return!0};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(l.call(a,c))return!1;return!0};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=n||function(a){return E.call(a)==="[object Array]"};b.isArguments=function(a){return!(!a||!l.call(a,"callee"))};b.isFunction=function(a){return!(!a||!a.constructor|| -!a.call||!a.apply)};b.isString=function(a){return!!(a===""||a&&a.charCodeAt&&a.substr)};b.isNumber=function(a){return!!(a===0||a&&a.toExponential&&a.toFixed)};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===!0||a===!1};b.isDate=function(a){return!(!a||!a.getTimezoneOffset||!a.setUTCFullYear)};b.isRegExp=function(a){return!(!a||!a.test||!a.exec||!(a.ignoreCase||a.ignoreCase===!1))};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.noConflict= -function(){p._=C;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e/g,interpolate:/<%=([\s\S]+?)%>/g};b.template=function(a,c){var d=b.templateSettings;d="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(d.interpolate, -function(a,b){return"',"+b.replace(/\\'/g,"'")+",'"}).replace(d.evaluate||null,function(a,b){return"');"+b.replace(/\\'/g,"'").replace(/[\r\n\t]/g," ")+"__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');";d=new Function("obj",d);return c?d(c):d};var j=function(a){this._wrapped=a};b.prototype=j.prototype;var r=function(a,c){return c?b(a).chain():a},H=function(a,c){j.prototype[a]=function(){var a=f.call(arguments);D.call(a,this._wrapped);return r(c.apply(b, -a),this._chain)}};b.mixin(b);h(["pop","push","reverse","shift","sort","splice","unshift"],function(a){var b=i[a];j.prototype[a]=function(){b.apply(this._wrapped,arguments);return r(this._wrapped,this._chain)}});h(["concat","join","slice"],function(a){var b=i[a];j.prototype[a]=function(){return r(b.apply(this._wrapped,arguments),this._chain)}});j.prototype.chain=function(){this._chain=!0;return this};j.prototype.value=function(){return this._wrapped}})(); +(d=b.identity);for(var e=0,f=a.length;e>1;d(a[g])=0})})};b.difference=function(a,c){return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=f.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e=0;d--)b=[a[d].apply(this,b)];return b[0]}};b.after= +function(a,b){return function(){if(--a<1)return b.apply(this,arguments)}};b.keys=F||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var b=[],d;for(d in a)l.call(a,d)&&(b[b.length]=d);return b};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&&c.push(d);return c.sort()};b.extend=function(a){h(f.call(arguments,1),function(b){for(var d in b)b[d]!==void 0&&(a[d]=b[d])});return a};b.defaults=function(a){h(f.call(arguments, +1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,c){if(a===c)return!0;var d=typeof a;if(d!=typeof c)return!1;if(a==c)return!0;if(!a&&c||a&&!c)return!1;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual)return a.isEqual(c);if(c.isEqual)return c.isEqual(a);if(b.isDate(a)&&b.isDate(c))return a.getTime()===c.getTime();if(b.isNaN(a)&&b.isNaN(c))return!1; +if(b.isRegExp(a)&&b.isRegExp(c))return a.source===c.source&&a.global===c.global&&a.ignoreCase===c.ignoreCase&&a.multiline===c.multiline;if(d!=="object")return!1;if(a.length&&a.length!==c.length)return!1;d=b.keys(a);var e=b.keys(c);if(d.length!=e.length)return!1;for(var f in a)if(!(f in c)||!b.isEqual(a[f],c[f]))return!1;return!0};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(l.call(a,c))return!1;return!0};b.isElement=function(a){return!!(a&&a.nodeType== +1)};b.isArray=n||function(a){return E.call(a)==="[object Array]"};b.isObject=function(a){return a===Object(a)};b.isArguments=function(a){return!(!a||!l.call(a,"callee"))};b.isFunction=function(a){return!(!a||!a.constructor||!a.call||!a.apply)};b.isString=function(a){return!!(a===""||a&&a.charCodeAt&&a.substr)};b.isNumber=function(a){return!!(a===0||a&&a.toExponential&&a.toFixed)};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===!0||a===!1};b.isDate=function(a){return!(!a||!a.getTimezoneOffset|| +!a.setUTCFullYear)};b.isRegExp=function(a){return!(!a||!a.test||!a.exec||!(a.ignoreCase||a.ignoreCase===!1))};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.noConflict=function(){p._=C;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e/g,interpolate:/<%=([\s\S]+?)%>/g}; +b.template=function(a,c){var d=b.templateSettings;d="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(d.interpolate,function(a,b){return"',"+b.replace(/\\'/g,"'")+",'"}).replace(d.evaluate||null,function(a,b){return"');"+b.replace(/\\'/g,"'").replace(/[\r\n\t]/g," ")+"__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');";d=new Function("obj",d);return c?d(c):d}; +var j=function(a){this._wrapped=a};b.prototype=j.prototype;var r=function(a,c){return c?b(a).chain():a},H=function(a,c){j.prototype[a]=function(){var a=f.call(arguments);D.call(a,this._wrapped);return r(c.apply(b,a),this._chain)}};b.mixin(b);h(["pop","push","reverse","shift","sort","splice","unshift"],function(a){var b=i[a];j.prototype[a]=function(){b.apply(this._wrapped,arguments);return r(this._wrapped,this._chain)}});h(["concat","join","slice"],function(a){var b=i[a];j.prototype[a]=function(){return r(b.apply(this._wrapped, +arguments),this._chain)}});j.prototype.chain=function(){this._chain=!0;return this};j.prototype.value=function(){return this._wrapped}})(); diff --git a/underscore.js b/underscore.js index 41cd7ce2a..4f5601325 100644 --- a/underscore.js +++ b/underscore.js @@ -1,4 +1,4 @@ -// Underscore.js 1.1.6 +// Underscore.js 1.1.7 // (c) 2011 Jeremy Ashkenas, DocumentCloud Inc. // Underscore is freely distributable under the MIT license. // Portions of Underscore are inspired or borrowed from Prototype, @@ -60,7 +60,7 @@ } // Current version. - _.VERSION = '1.1.6'; + _.VERSION = '1.1.7'; // Collection Functions // --------------------