diff --git a/LICENSE b/LICENSE index 58c73b9e9..61d28c08e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2011 Jeremy Ashkenas, DocumentCloud +Copyright (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/docs/underscore.html b/docs/underscore.html index fffbe9cbb..b4e9f4349 100644 --- a/docs/underscore.html +++ b/docs/underscore.html @@ -1,12 +1,11 @@ - underscore.js

underscore.js 

Underscore.js 1.2.3
-(c) 2009-2011 Jeremy Ashkenas, DocumentCloud Inc.
+      underscore.js           
     
          return_;});}else{
 allowing you to adjust arguments, run code before and after, and
 conditionally execute the original function.
evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g
-  };'with(obj||{}){__p.push(\''+str.replace(/\\/g,'\\\\').replace(/'/g,"\\'")
-         .replace(c.escape,function(match,code){
+         .replace(c.escape||noMatch,function(match,code){return"',_.escape("+code.replace(/\\'/g,"'")+"),'";})
-         .replace(c.interpolate,function(match,code){
+         .replace(c.interpolate||noMatch,function(match,code){return"',"+code.replace(/\\'/g,"'")+",'";})
-         .replace(c.evaluate||null,function(match,code){
+         .replace(c.evaluate||noMatch,function(match,code){return"');"+code.replace(/\\'/g,"'")
-                              .replace(/[\r\n\t]/g,' ')+";__p.push('";
+                              .replace(/[\r\n\t]/g,' ')
+                              .replace(/\\\\/g,'\\')+";__p.push('";}).replace(/\r/g,'\\r').replace(/\n/g,'\\n')
@@ -588,31 +591,36 @@ and correctly escapes quotes within interpolated code.
returnfunction(data){returnfunc.call(this,data,_);};
-  };
                
                        
               underscore.js             
           		                               
                                             
                            
                                
               
Underscore.js 1.2.4
+(c) 2009-2012 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() {
             		           
                               
                            
                                
               
Baseline setup
             		                            
             		           
                               
                            
                                
               
Establish the root object, window in the browser, or global on the server.
             		                            
  var root = this;
             		           
                               
                            
                                
               
Save the previous value of the _ variable.
             		                            
  var previousUnderscore = root._;
             		           
                               
                            
                                
               
Establish the object that gets returned to break out of a loop iteration.
             		                            
  var breaker = {};
             		           
                               
                            
                                
               
Save bytes in the minified (but not gzipped) version:
             		                            
  var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
             		           
                               
                            
                                
               
Create quick reference variables for speed access to core prototypes.
             		                            
  var slice            = ArrayProto.slice,
-      concat           = ArrayProto.concat,
       unshift          = ArrayProto.unshift,
       toString         = ObjProto.toString,
       hasOwnProperty   = ObjProto.hasOwnProperty;
             		           
                               
                            
                                
               
All ECMAScript 5 native function implementations that we hope to use
@@ -33,7 +32,7 @@ CommonJS, add _ to the global object.
             		
        
     
                             
                               
                            
                                
               
Exported as a string, for Closure Compiler "advanced" mode.
             		                            
    root['_'] = _;
-  }
             		           
                               
                            
                                
               
Current version.
             		                            
  _.VERSION = '1.2.3';
             		           
                               
                            
                                
               
Collection Functions
             		                            
             		           
                               
                            
                                
               
The cornerstone, an each implementation, aka forEach.
+  }             
           
                               
                            
                                
               
Current version.
             		                            
  _.VERSION = '1.2.4';
             		           
                               
                            
                                
               
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;
@@ -58,6 +57,7 @@ Delegates to ECMAScript 5's native map if availabl
     each(obj, function(value, index, list) {
       results[results.length] = iterator.call(context, value, index, list);
     });
+    if (obj.length === +obj.length) results.length = obj.length;
     return results;
   };
             		           
                               
                            
                                
               
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) {
@@ -147,7 +147,7 @@ Aliased as contains.
             
             };                        
                               
                            
                                
               
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);
+      return (_.isFunction(method) ? method || value : value[method]).apply(value, args);
     });
   };
             		           
                               
                            
                                
               
Convenience version of a common use case of map: fetching a property.
             		                            
  _.pluck = function(obj, key) {
     return _.map(obj, function(value){ return value[key]; });
@@ -404,7 +404,7 @@ often you call it. Useful for lazy initialization.
             
                                         
  _.wrap = function(func, wrapper) {
     return function() {
-      var args = concat.apply([func], arguments);
+      var args = [func].concat(slice.call(arguments, 0));
       return wrapper.apply(this, args);
     };
   };
             		           
                               
                            
                                
               
Returns a function that is the composition of a list of functions, each
@@ -561,7 +561,9 @@ following template settings to use alternative delimiters.
             		
          
       
                                    
                               
                            
                                
               
JavaScript micro-templating, similar to John Resig's implementation.
+  };             
           
                               
                            
                                
               
When customizing templateSettings, if you don't want to define an
+interpolation, evaluation or escaping regex, we need one that is
+guaranteed not to match.
             		                            
  var noMatch = /.^/;
             		           
                               
                            
                                
               
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;
@@ -569,15 +571,16 @@ and correctly escapes quotes within interpolated code.
             

        
        
                   
                  
                  
                  
                    
                       
          
           
                        
       
          
                             
                               
                            
                                
               
The OOP Wrapper
             		                            
             		           
                               
                            
                                
               
If Underscore is called as a function, it returns a wrapped object that
+  };             
           
                               
                            
                                
               
Add a "chain" function, which will delegate to the wrapper.
             		                            
  _.chain = function(obj) {
+    return _(obj).chain();
+  };
             		           
                               
                            
                                
               
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);
+      var wrapped = this._wrapped;
+      method.apply(wrapped, arguments);
+      var length = wrapped.length;
+      if ((name == 'shift' || name == 'splice') && length === 0) delete wrapped[0];
+      return result(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 5ca6c97f9..d1e7d002b 100644
--- a/index.html
+++ b/index.html
@@ -126,11 +126,11 @@
 
     
-        
+        
-        
+        

       
Development Version (1.2.3)Development Version (1.2.4)
         34kb, Uncompressed with Comments
       

       
Production Version (1.2.3)Production Version (1.2.4)
         < 4kb, Minified and Gzipped
       

     

@@ -232,7 +232,7 @@ var lyrics = [
   {line : 4, words : "He sleeps all night and he works all day"}
 ];
 
-_(lyrics).chain()
+_.chain(lyrics)
   .map(function(line) { return line.words.split(' '); })
   .flatten()
   .reduce(function(counts, word) {
@@ -958,11 +958,11 @@ _.clone({name : 'moe'});
         The primary purpose of this method is to "tap into" a method chain, in order to perform operations on intermediate results within the chain.
       

       
-_([1,2,3,200]).chain().
-  filter(function(num) { return num % 2 == 0; }).
-  tap(console.log).
-  map(function(num) { return num * num }).
-  value();
+_.chain([1,2,3,200])
+  .filter(function(num) { return num % 2 == 0; })
+  .tap(console.log)
+  .map(function(num) { return num * num })
+  .value();
 => [2, 200]
 => [4, 40000]
 

@@ -1257,7 +1257,7 @@ template({name : "Mustache"});
       
Chaining

 
       

-        chain_(obj).chain()
+        chain_.chain(obj)
         

         Returns a wrapped object. Calling methods on this object will continue
         to return wrapped objects until value is used. (
@@ -1265,7 +1265,7 @@ template({name : "Mustache"});
       

       
 var stooges = [{name : 'curly', age : 25}, {name : 'moe', age : 21}, {name : 'larry', age : 23}];
-var youngest = _(stooges).chain()
+var youngest = _.chain(stooges)
   .sortBy(function(stooge){ return stooge.age; })
   .map(function(stooge){ return stooge.name + ' is ' + stooge.age; })
   .first()
@@ -1341,6 +1341,28 @@ _([1, 2, 3]).value();
 
       
Change Log

       
+      

+        1.2.4 — Jan. 4, 2012

+        
    
+          
  • 
+            You now can (and probably should) write _.chain(list) 
+            instead of _(list).chain().
+          
    • 
+          
  • 
+            Fix for escaped characters in Underscore templates, and for supporting
+            customizations of _.templateSettings that only define one or
+            two of the required regexes.
+          
    • 
+          
  • 
+            Fix for passing an array as the first argument to an _.wrap'd function.
+          
    • 
+          
  • 
+            Improved compatibility with ClojureScript, which adds a call
+            function to String.prototype.
+          
    • 
+        

+      

+      
       

         1.2.3 — Dec. 7, 2011

         
    
diff --git a/package.json b/package.json
index eda11ad52..b65c188e8 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.2.3"
+  "version"       : "1.2.4"
 }
diff --git a/underscore-min.js b/underscore-min.js
index a2a40e4c0..122914e24 100644
--- a/underscore-min.js
+++ b/underscore-min.js
@@ -1,5 +1,5 @@
-// Underscore.js 1.2.3
-// (c) 2009-2011 Jeremy Ashkenas, DocumentCloud Inc.
+// Underscore.js 1.2.4
+// (c) 2009-2012 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.
@@ -7,24 +7,25 @@
 // http://documentcloud.github.com/underscore
 (function(){function r(a,c,d){if(a===c)return a!==0||1/a==1/c;if(a==null||c==null)return a===c;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return false;switch(e){case "[object String]":return a==String(c);case "[object Number]":return a!=+a?c!=+c:a==0?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object RegExp]":return a.source==
 c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if(typeof a!="object"||typeof c!="object")return false;for(var f=d.length;f--;)if(d[f]==a)return true;d.push(a);var f=0,g=true;if(e=="[object Array]"){if(f=a.length,g=f==c.length)for(;f--;)if(!(g=f in a==f in c&&r(a[f],c[f],d)))break}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return false;for(var h in a)if(m.call(a,h)&&(f++,!(g=m.call(c,h)&&r(a[h],c[h],d))))break;if(g){for(h in c)if(m.call(c,
-h)&&!f--)break;g=!f}}d.pop();return g}var s=this,F=s._,o={},k=Array.prototype,p=Object.prototype,i=k.slice,G=k.concat,H=k.unshift,l=p.toString,m=p.hasOwnProperty,v=k.forEach,w=k.map,x=k.reduce,y=k.reduceRight,z=k.filter,A=k.every,B=k.some,q=k.indexOf,C=k.lastIndexOf,p=Array.isArray,I=Object.keys,t=Function.prototype.bind,b=function(a){return new n(a)};if(typeof exports!=="undefined"){if(typeof module!=="undefined"&&module.exports)exports=module.exports=b;exports._=b}else typeof define==="function"&&
-define.amd?define("underscore",function(){return b}):s._=b;b.VERSION="1.2.3";var j=b.each=b.forEach=function(a,c,b){if(a!=null)if(v&&a.forEach===v)a.forEach(c,b);else if(a.length===+a.length)for(var e=0,f=a.length;e2;a==null&&(a=[]);if(x&&a.reduce===x)return e&&(c=b.bind(c,e)),f?a.reduce(c,d):a.reduce(c);j(a,function(a,b,i){f?d=c.call(e,d,a,b,i):(d=a,f=true)});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(y&&a.reduceRight===y)return e&&(c=b.bind(c,e)),f?a.reduceRight(c,d):a.reduceRight(c);var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,
-c,d,e):b.reduce(g,c)};b.find=b.detect=function(a,c,b){var e;D(a,function(a,g,h){if(c.call(b,a,g,h))return e=a,true});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(z&&a.filter===z)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(A&&a.every===A)return a.every(c,
-b);j(a,function(a,g,h){if(!(e=e&&c.call(b,a,g,h)))return o});return e};var D=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(B&&a.some===B)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return o});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;return q&&a.indexOf===q?a.indexOf(c)!=-1:b=D(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(c.call?c||a:a[c]).apply(a,
-d)})};b.pluck=function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=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);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;bd?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]};j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).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.difference=function(a){var c=b.flatten(i.call(arguments,1));return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=i.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 a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=I||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var b=[],d;for(d in a)m.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){j(i.call(arguments,1),function(b){for(var d in b)b[d]!==void 0&&(a[d]=b[d])});return a};b.defaults=function(a){j(i.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.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return r(a,b,[])};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(m.call(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=p||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){return a===
-Object(a)};b.isArguments=function(a){return l.call(a)=="[object Arguments]"};if(!b.isArguments(arguments))b.isArguments=function(a){return!(!a||!m.call(a,"callee"))};b.isFunction=function(a){return l.call(a)=="[object Function]"};b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a)==
-"[object Date]"};b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.noConflict=function(){s._=F;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e/g,">").replace(/"/g,""").replace(/'/g,"'").replace(/\//g,"/")};b.mixin=function(a){j(b.functions(a),function(c){J(c,
-b[c]=a[c])})};var K=0;b.uniqueId=function(a){var b=K++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\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.escape,function(a,b){return"',_.escape("+b.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('');",e=new Function("obj","_",d);return c?e(c,b):function(a){return e.call(this,a,b)}};var n=function(a){this._wrapped=a};b.prototype=n.prototype;var u=function(a,c){return c?b(a).chain():a},J=function(a,c){n.prototype[a]=function(){var a=i.call(arguments);H.call(a,this._wrapped);return u(c.apply(b,
-a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];n.prototype[a]=function(){b.apply(this._wrapped,arguments);return u(this._wrapped,this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];n.prototype[a]=function(){return u(b.apply(this._wrapped,arguments),this._chain)}});n.prototype.chain=function(){this._chain=true;return this};n.prototype.value=function(){return this._wrapped}}).call(this);
+h)&&!f--)break;g=!f}}d.pop();return g}var s=this,G=s._,o={},k=Array.prototype,p=Object.prototype,i=k.slice,H=k.unshift,l=p.toString,m=p.hasOwnProperty,w=k.forEach,x=k.map,y=k.reduce,z=k.reduceRight,A=k.filter,B=k.every,C=k.some,q=k.indexOf,D=k.lastIndexOf,p=Array.isArray,I=Object.keys,t=Function.prototype.bind,b=function(a){return new n(a)};if(typeof exports!=="undefined"){if(typeof module!=="undefined"&&module.exports)exports=module.exports=b;exports._=b}else typeof define==="function"&&define.amd?
+define("underscore",function(){return b}):s._=b;b.VERSION="1.2.4";var j=b.each=b.forEach=function(a,c,b){if(a!=null)if(w&&a.forEach===w)a.forEach(c,b);else if(a.length===+a.length)for(var e=0,f=a.length;e2;a==null&&(a=[]);if(y&&a.reduce===y)return e&&(c=b.bind(c,e)),f?a.reduce(c,d):a.reduce(c);j(a,function(a,b,i){f?d=c.call(e,d,a,b,i):(d=a,f=true)});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(z&&a.reduceRight===z)return e&&(c=b.bind(c,e)),f?a.reduceRight(c,d):a.reduceRight(c);var g=b.toArray(a).reverse();e&&!f&&
+(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.find=b.detect=function(a,c,b){var e;E(a,function(a,g,h){if(c.call(b,a,g,h))return e=a,true});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(A&&a.filter===A)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;
+if(B&&a.every===B)return a.every(c,b);j(a,function(a,g,h){if(!(e=e&&c.call(b,a,g,h)))return o});return e};var E=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(C&&a.some===C)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return o});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;return q&&a.indexOf===q?a.indexOf(c)!=-1:b=E(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,
+function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d)})};b.pluck=function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=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);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,
+b,h){b=c?c.call(d,a,b,h):a;bd?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]};j(a,function(a,b){var c=
+e(a,b);(d[c]||(d[c]=[])).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.difference=function(a){var c=b.flatten(i.call(arguments,1));return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=i.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 a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=I||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var b=[],d;for(d in a)m.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){j(i.call(arguments,1),function(b){for(var d in b)b[d]!==
+void 0&&(a[d]=b[d])});return a};b.defaults=function(a){j(i.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.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return r(a,b,[])};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(m.call(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=p||function(a){return l.call(a)==
+"[object Array]"};b.isObject=function(a){return a===Object(a)};b.isArguments=function(a){return l.call(a)=="[object Arguments]"};if(!b.isArguments(arguments))b.isArguments=function(a){return!(!a||!m.call(a,"callee"))};b.isFunction=function(a){return l.call(a)=="[object Function]"};b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};
+b.isDate=function(a){return l.call(a)=="[object Date]"};b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.noConflict=function(){s._=G;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e/g,">").replace(/"/g,""").replace(/'/g,"'").replace(/\//g,"/")};
+b.mixin=function(a){j(b.functions(a),function(c){J(c,b[c]=a[c])})};var K=0;b.uniqueId=function(a){var b=K++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var u=/.^/;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.escape||u,function(a,b){return"',_.escape("+b.replace(/\\'/g,"'")+"),'"}).replace(d.interpolate||
+u,function(a,b){return"',"+b.replace(/\\'/g,"'")+",'"}).replace(d.evaluate||u,function(a,b){return"');"+b.replace(/\\'/g,"'").replace(/[\r\n\t]/g," ").replace(/\\\\/g,"\\")+";__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');",e=new Function("obj","_",d);return c?e(c,b):function(a){return e.call(this,a,b)}};b.chain=function(a){return b(a).chain()};var n=function(a){this._wrapped=a};b.prototype=n.prototype;var v=function(a,c){return c?b(a).chain():
+a},J=function(a,c){n.prototype[a]=function(){var a=i.call(arguments);H.call(a,this._wrapped);return v(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];n.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return v(d,this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];n.prototype[a]=function(){return v(b.apply(this._wrapped,arguments),this._chain)}});
+n.prototype.chain=function(){this._chain=true;return this};n.prototype.value=function(){return this._wrapped}}).call(this);
diff --git a/underscore.js b/underscore.js
index 76e3f7910..c8cd1fd0e 100644
--- a/underscore.js
+++ b/underscore.js
@@ -1,5 +1,5 @@
-//     Underscore.js 1.2.3
-//     (c) 2009-2011 Jeremy Ashkenas, DocumentCloud Inc.
+//     Underscore.js 1.2.4
+//     (c) 2009-2012 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.
@@ -67,7 +67,7 @@
   }
 
   // Current version.
-  _.VERSION = '1.2.3';
+  _.VERSION = '1.2.4';
 
   // Collection Functions
   // --------------------