diff --git a/docs/underscore.html b/docs/underscore.html index fdcf8166c..726b8976a 100644 --- a/docs/underscore.html +++ b/docs/underscore.html @@ -1,4 +1,4 @@ - underscore.js

underscore.js 

Underscore.js 1.1.7
+      underscore.js           
     
          iterator(array[mid])<iterator(obj)?low=mid+1:high=mid;}returnlow;
-  };return_.indexOf(other,item)>=0;});});
-  };if(nativeIndexOf&&array.indexOf===nativeIndexOf)returnarray.indexOf(item);for(i=0,l=array.length;i<l;i++)if(array[i]===item)returni;return-1;
-  };ran=true;returnmemo=func.apply(this,arguments);};
-  };}returnargs[0];};
-  };'with(obj||{}){__p.push(\''+str.replace(/\\/g,'\\\\').replace(/'/g,"\\'")
+         .replace(c.escape,function(match,code){
+           return"',_.escape("+code.replace(/\\'/g,"'")+"),'";
+         }).replace(c.interpolate,function(match,code){return"',"+code.replace(/\\'/g,"'")+",'";})
@@ -478,31 +538,31 @@ and correctly escapes quotes within interpolated code.
+"');}return __p.join('');";varfunc=newFunction('obj',tmpl);returndata?func(data):func;
-  };
                
                        
               underscore.js             
           		                               
                                             
                            
                                
               
Underscore.js 1.2.0
 (c) 2011 Jeremy Ashkenas, DocumentCloud Inc.
 Underscore is freely distributable under the MIT license.
 Portions of Underscore are inspired or borrowed from Prototype,
@@ -27,7 +27,7 @@ global object.
             
             
     module.exports = _;
     _._ = _;
   } 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.
+  }             
           
                               
                            
                                
               
Current version.
             		                            
  _.VERSION = '1.2.0';
             		           
                               
                            
                                
               
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;
@@ -145,6 +145,7 @@ Aliased as contains.
             
             return _.map(obj, function(value){ return value[key]; });
   };                        
                               
                            
                                
               
Return the maximum element or (element-based computation).
             		                            
  _.max = function(obj, iterator, context) {
     if (!iterator && _.isArray(obj)) return Math.max.apply(Math, obj);
+    if (!iterator && _.isEmpty(obj)) return -Infinity;
     var result = {computed : -Infinity};
     each(obj, function(value, index, list) {
       var computed = iterator ? iterator.call(context, value, index, list) : value;
@@ -153,13 +154,26 @@ Aliased as contains.
             
             return result.value;
   };                        
                               
                            
                                
               
Return the minimum element (or element-based computation).
             		                            
  _.min = function(obj, iterator, context) {
     if (!iterator && _.isArray(obj)) return Math.min.apply(Math, obj);
+    if (!iterator && _.isEmpty(obj)) return Infinity;
     var result = {computed : Infinity};
     each(obj, function(value, index, list) {
       var computed = iterator ? iterator.call(context, value, index, list) : value;
       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) {
+  };
             		           
                               
                            
                                
               
Shuffle an array.
             		                            
  _.shuffle = function(obj) {
+    var shuffled = [], rand;
+    each(obj, function(value, index, list) {
+      if (index == 0) {
+        shuffled[0] = value;
+      } else {
+        rand = Math.floor(Math.random() * (index + 1));
+        shuffled[index] = shuffled[rand];
+        shuffled[rand] = value;
+      }
+    });
+    return shuffled;
+  };
             		           
                               
                            
                                
               
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,
@@ -169,14 +183,14 @@ Aliased as contains.
             
             var a = left.criteria, b = right.criteria;
       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) {
+  };
             		           
                               
                            
                                
               
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
+  };             
           
                               
                            
                                
               
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;
@@ -185,46 +199,58 @@ be inserted so as to maintain order. Uses binary search.
             

                   
     
                              
                               
                            
                                
               
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 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 last entry of the array. Especcialy useful on
+the arguments object. Passing n will return all the values in
+the array, excluding the last N. The guard check allows it to work with
+_.map.
             		                            
  _.initial = function(array, n, guard) {
+    return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n));
+  };
             		           
                               
                            
                                
               
Get the last element of an array. Passing n will return the last N
+values in the array. The guard check allows it to work with _.map.
             		                            
  _.last = function(array, n, guard) {
+    return (n != null) && !guard ? slice.call(array, array.length - n) : array[array.length - 1];
+  };
             		           
                               
                            
                                
               
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) {
-    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) {
+  };
             		           
                               
                            
                                
               
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
+  };             
           
                               
                            
                                
               
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;
+Aliased as unique.
             
                            
  _.uniq = _.unique = function(array, isSorted, iterator) {
+    var initial = iterator ? _.map(array, iterator) : array;
+    var result = [];
+    _.reduce(initial, function(memo, el, i) {
+      if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) {
+        memo[memo.length] = el;
+        result[result.length] = array[i];
+      }
       return memo;
     }, []);
-  };
             		           
                               
                            
                                
               
Produce an array that contains the union: each distinct element from all of
+    return result;
+  };             
           
                               
                            
                                
               
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
+  };             
           
                               
                            
                                
               
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) {
@@ -232,17 +258,17 @@ passed-in arrays. (Aliased as "intersect" for back-compat.)
             
    
       
                             
                               
                            
                                
               
Take the difference between one array and another.
+  };             
           
                               
                            
                                
               
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
+  };             
           
                               
                            
                                
               
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.
@@ -257,13 +283,13 @@ for isSorted to use binary search.
             		
            
                     
                              
                               
                            
                                
               
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) {
@@ -282,7 +308,7 @@ the native Python range() function. See
     }
 
     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) {
@@ -291,27 +317,27 @@ We check for func.bind first, to fail fast when func i
     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;
@@ -322,14 +348,14 @@ cleared.
             
                            
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() {
@@ -337,14 +363,14 @@ often you call it. Useful for lazy initialization.
             

         
           
                             
                               
                            
                                
               
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() {
@@ -354,110 +380,141 @@ consuming the return value of the function that follows.
             

       
        
                             
                               
                            
                                
               
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) {
     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) {
+  };
             		           
                               
                            
                                
               
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);
-    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;
-    return true;
-  };
             		           
                               
                            
                                
               
Is a given array or object empty?
             		                            
  _.isEmpty = function(obj) {
+  };
             		           
                               
                            
                                
               
Internal recursive comparison function.
             		                            
  function eq(a, b, stack) {
             		           
                               
                            
                                
               
Identical objects are equal. 0 === -0, but they aren't identical.
+See the Harmony egal proposal: http://wiki.ecmascript.org/doku.php?id=harmony:egal.
             		                            
    if (a === b) return a !== 0 || 1 / a == 1 / b;
             		           
                               
                            
                                
               
A strict comparison is necessary because null == undefined.
             		                            
    if (a == null) return a === b;
             		           
                               
                            
                                
               
Compare object types.
             		                            
    var typeA = typeof a;
+    if (typeA != typeof b) return false;
             		           
                               
                            
                                
               
Optimization; ensure that both values are truthy or falsy.
             		                            
    if (!a != !b) return false;
             		           
                               
                            
                                
               
NaN values are equal.
             		                            
    if (_.isNaN(a)) return _.isNaN(b);
             		           
                               
                            
                                
               
Compare string objects by value.
             		                            
    var isStringA = _.isString(a), isStringB = _.isString(b);
+    if (isStringA || isStringB) return isStringA && isStringB && String(a) == String(b);
             		           
                               
                            
                                
               
Compare number objects by value.
             		                            
    var isNumberA = _.isNumber(a), isNumberB = _.isNumber(b);
+    if (isNumberA || isNumberB) return isNumberA && isNumberB && +a == +b;
             		           
                               
                            
                                
               
Compare boolean objects by value. The value of true is 1; the value of false is 0.
             		                            
    var isBooleanA = _.isBoolean(a), isBooleanB = _.isBoolean(b);
+    if (isBooleanA || isBooleanB) return isBooleanA && isBooleanB && +a == +b;
             		           
                               
                            
                                
               
Compare dates by their millisecond values.
             		                            
    var isDateA = _.isDate(a), isDateB = _.isDate(b);
+    if (isDateA || isDateB) return isDateA && isDateB && a.getTime() == b.getTime();
             		           
                               
                            
                                
               
Compare RegExps by their source patterns and flags.
             		                            
    var isRegExpA = _.isRegExp(a), isRegExpB = _.isRegExp(b);
+    if (isRegExpA || isRegExpB) {
             		           
                               
                            
                                
               
Ensure commutative equality for RegExps.
             		                            
      return isRegExpA && isRegExpB &&
+             a.source == b.source &&
+             a.global == b.global &&
+             a.multiline == b.multiline &&
+             a.ignoreCase == b.ignoreCase;
+    }
             		           
                               
                            
                                
               
Ensure that both values are objects.
             		                            
    if (typeA != 'object') return false;
             		           
                               
                            
                                
               
Unwrap any wrapped objects.
             		                            
    if (a._chain) a = a._wrapped;
+    if (b._chain) b = b._wrapped;
             		           
                               
                            
                                
               
Invoke a custom isEqual method if one is provided.
             		                            
    if (_.isFunction(a.isEqual)) return a.isEqual(b);
             		           
                               
                            
                                
               
Assume equality for cyclic structures. The algorithm for detecting cyclic structures is
+adapted from ES 5.1 section 15.12.3, abstract operation JO.
             		                            
    var length = stack.length;
+    while (length--) {
             		           
                               
                            
                                
               
Linear search. Performance is inversely proportional to the number of unique nested
+structures.
             		                            
      if (stack[length] == a) return true;
+    }
             		           
                               
                            
                                
               
Add the first object to the stack of traversed objects.
             		                            
    stack.push(a);
+    var size = 0, result = true;
+    if (a.length === +a.length || b.length === +b.length) {
             		           
                               
                            
                                
               
Compare object lengths to determine if a deep comparison is necessary.
             		                            
      size = a.length;
+      result = size == b.length;
+      if (result) {
             		           
                               
                            
                                
               
Deep compare array-like object contents, ignoring non-numeric properties.
             		                            
        while (size--) {
             		           
                               
                            
                                
               
Ensure commutative equality for sparse arrays.
             		                            
          if (!(result = size in a == size in b && eq(a[size], b[size], stack))) break;
+        }
+      }
+    } else {
             		           
                               
                            
                                
               
Deep compare objects.
             		                            
      for (var key in a) {
+        if (hasOwnProperty.call(a, key)) {
             		           
                               
                            
                                
               
Count the expected number of properties.
             		                            
          size++;
             		           
                               
                            
                                
               
Deep compare each member.
             		                            
          if (!(result = hasOwnProperty.call(b, key) && eq(a[key], b[key], stack))) break;
+        }
+      }
             		           
                               
                            
                                
               
Ensure that both objects contain the same number of properties.
             		                            
      if (result) {
+        for (key in b) {
+          if (hasOwnProperty.call(b, key) && !size--) break;
+        }
+        result = !size;
+      }
+    }
             		           
                               
                            
                                
               
Remove the first object from the stack of traversed objects.
             		                            
    stack.pop();
+    return result;
+  }
             		           
                               
                            
                                
               
Perform a deep comparison to check if two objects are equal.
             		                            
  _.isEqual = function(a, b) {
+    return eq(a, b, []);
+  };
             		           
                               
                            
                                
               
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 object?
             		                            
  _.isObject = 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) {
+  };
             		           
                               
                            
                                
               
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) {
-    return obj === true || obj === false;
-  };
             		           
                               
                            
                                
               
Is a given value a date?
             		                            
  _.isDate = function(obj) {
+  };
             		           
                               
                            
                                
               
Is a given value a boolean?
             		                            
  _.isBoolean = function(obj) {
+    return obj === true || obj === false || toString.call(obj) == '[object Boolean]';
+  };
             		           
                               
                            
                                
               
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
+  };             
           
                               
                            
                                
               
Escape a string for HTML interpolation.
             		                            
  _.escape = function(string) {
+    return (''+string).replace(/&(?!\w+;|#\d+;|#x[\da-f]+;)/gi, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#x27;').replace(/\//g,'&#x2F;');
+  };
             		           
                               
                            
                                
               
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.
+    interpolate : /<%=([\s\S]+?)%>/g,
+    escape      : /<%-([\s\S]+?)%>/g
+  };             
           
                               
                            
                                
               
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;
@@ -465,6 +522,9 @@ and correctly escapes quotes within interpolated code.
             

        
        
                    
             
                  
                       
           
          
                                  
                               
                            
                                
               
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 c33cc95d5..bf08b2dd7 100644
--- a/index.html
+++ b/index.html
@@ -49,6 +49,14 @@
       td {
         padding: 2px 12px 2px 0;
       }
+    ul {
+      list-style-type: circle;
+      padding: 0 0 0 20px;
+    }
+      li {
+        width: 500px;
+        margin-bottom: 10px;
+      }
     code, pre, tt {
       font-family: Monaco, Consolas, "Lucida Console", monospace;
       font-size: 12px;
@@ -118,11 +126,11 @@
 
     
-        
+        
-        
+        

       
Development Version (1.1.7)Development Version (1.2.0)
         28kb, Uncompressed with Comments
       

       
Production Version (1.1.7)Production Version (1.2.0)
         3kb, Minified and Gzipped
       

     

@@ -149,7 +157,7 @@
     

       Arrays
       

-      first, rest, last,
+      first, initial, last, rest,
       compact, flatten, without, 
       union, intersection, difference, 
       uniq, zip, indexOf,
@@ -468,7 +476,8 @@ _.sortedIndex([10, 20, 30, 40, 50], 35);
       

         shuffle_.shuffle(list)
         

-        Returns a shuffled copy of list.
+        Returns a shuffled copy of the list, using a version of the 
+        Fisher-Yates shuffle.
       

       
 _.shuffle([1, 2, 3, 4, 5, 6]);
@@ -512,6 +521,29 @@ _.size({one : 1, two : 2, three : 3});
       
 _.first([5, 4, 3, 2, 1]);
 => 5
+

+
+      

+        initial_.initial(array, [n])
+        

+        Returns everything but the last entry of the array. Especially useful on
+        the arguments object. Pass n to exclude the last n elements
+        from the result.
+      

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

+
+      

+        last_.last(array, [n])
+        

+        Returns the last element of an array. Passing n will return
+        the last n elements of the array.
+      

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

 
       

@@ -524,16 +556,6 @@ _.first([5, 4, 3, 2, 1]);
       
 _.rest([5, 4, 3, 2, 1]);
 => [4, 3, 2, 1]
-

-
-      

-        last_.last(array)
-        

-        Returns the last element of an array.
-      

-      
-_.last([5, 4, 3, 2, 1]);
-=> 1
 

 
       

@@ -1162,7 +1184,8 @@ _.uniqueId('contact_');
         for rendering. Useful for rendering complicated bits of HTML from JSON
         data sources. Template functions can both interpolate variables, using

         <%= … %>, as well as execute arbitrary JavaScript code, with
-        <% … %>. When you evaluate a template function, pass in a
+        <% … %>. If you wish to interpolate a value, and have
+        it be HTML-escaped, use <%- … %> When you evaluate a template function, pass in a
         context object that has properties corresponding to the template's free
         variables. If you're writing a one-off, you can pass the context
         object as the second parameter to template in order to render
@@ -1175,7 +1198,11 @@ compiled({name : 'moe'});
 
 var list = "<% _.each(people, function(name) { %> <li><%= name %></li> <% }); %>";
 _.template(list, {people : ['moe', 'curly', 'larry']});
-=> "<li>moe</li><li>curly</li><li>larry</li>"

+=> "<li>moe</li><li>curly</li><li>larry</li>"
+
+var template = _.template("<b><%- value %></b>");
+template({value : '<script>'});
+=> "<b>&lt;script&gt;</b>"

 
       

         You can also use print from within JavaScript code.  This is
@@ -1315,6 +1342,34 @@ _([1, 2, 3]).value();
 
       
Change Log

       
+      

+        1.2.0 — Oct. 5, 2011

+        
    
+          
  • 
+            Underscore templates now support HTML escaping interpolations, using 
+            <%- ... %> syntax. The _.isEqual function now 
+            supports true deep equality comparisons, with checks for cyclic structures,
+            thanks to Kit Cambridge.
+          
    • 
+          
  • 
+            Ryan Tenney contributed _.shuffle, which uses a modified 
+            Fisher-Yates to give you a shuffled copy of an array. 
+          
    • 
+          
  • 
+            _.uniq can now be passed an optional iterator, to determine by 
+            what criteria an object should be considered unique.
+          
    • 
+          
  • 
+            _.last now takes an optional argument which will return the last
+            N elements of the list.
+          
    • 
+          
  • 
+            A new _.initial function was added, as a mirror of _.rest,
+            which returns all the initial values of a list (except the last N). 
+          
    • 
+        

+      

+      
       

         1.1.7 — July 13, 2011

         Added _.groupBy, which aggregates a collection into groups of like items.
diff --git a/package.json b/package.json
index 08396c4d9..eb4eee826 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.7"
+  "version"       : "1.2.0"
 }
diff --git a/underscore-min.js b/underscore-min.js
index 5983694cf..caa773615 100644
--- a/underscore-min.js
+++ b/underscore-min.js
@@ -1,27 +1,29 @@
-// Underscore.js 1.1.7
+// Underscore.js 1.2.0
 // (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.7";var h=b.each=b.forEach=function(a,c,b){if(a!=null)if(s&&a.forEach===s)a.forEach(c,b);else if(a.length===
-+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.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}})();
+(function(){function q(a,c,d){if(a===c)return a!==0||1/a==1/c;if(a==null)return a===c;var e=typeof a;if(e!=typeof c)return false;if(!a!=!c)return false;if(b.isNaN(a))return b.isNaN(c);var f=b.isString(a),g=b.isString(c);if(f||g)return f&&g&&String(a)==String(c);f=b.isNumber(a);g=b.isNumber(c);if(f||g)return f&&g&&+a==+c;f=b.isBoolean(a);g=b.isBoolean(c);if(f||g)return f&&g&&+a==+c;f=b.isDate(a);g=b.isDate(c);if(f||g)return f&&g&&a.getTime()==c.getTime();f=b.isRegExp(a);g=b.isRegExp(c);if(f||g)return f&&
+g&&a.source==c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase;if(e!="object")return false;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(b.isFunction(a.isEqual))return a.isEqual(c);for(e=d.length;e--;)if(d[e]==a)return true;d.push(a);e=0;f=true;if(a.length===+a.length||c.length===+c.length){if(e=a.length,f=e==c.length)for(;e--;)if(!(f=e in a==e in c&&q(a[e],c[e],d)))break}else{for(var h in a)if(l.call(a,h)&&(e++,!(f=l.call(c,h)&&q(a[h],c[h],d))))break;if(f){for(h in c)if(l.call(c,
+h)&&!e--)break;f=!e}}d.pop();return f}var r=this,F=r._,n={},k=Array.prototype,o=Object.prototype,i=k.slice,G=k.unshift,u=o.toString,l=o.hasOwnProperty,v=k.forEach,w=k.map,x=k.reduce,y=k.reduceRight,z=k.filter,A=k.every,B=k.some,p=k.indexOf,C=k.lastIndexOf,o=Array.isArray,H=Object.keys,s=Function.prototype.bind,b=function(a){return new m(a)};typeof module!=="undefined"&&module.exports?(module.exports=b,b._=b):r._=b;b.VERSION="1.2.0";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;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);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,b){var d={};j(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.difference=function(a,c){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 function(){if(--a<1)return b.apply(this,
+arguments)}};b.keys=H||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){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.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return q(a,b,[])};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 false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=o||function(a){return u.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===true||a===false||u.call(a)=="[object Boolean]"};b.isDate=function(a){return!(!a||!a.getTimezoneOffset||!a.setUTCFullYear)};b.isRegExp=function(a){return!(!a||!a.test||!a.exec||!(a.ignoreCase||a.ignoreCase===false))};b.isNull=
+function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.noConflict=function(){r._=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){I(c,b[c]=a[c])})};var J=0;b.uniqueId=function(a){var b=
+J++;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('');",d=new Function("obj",d);return c?d(c):d};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var t=function(a,c){return c?b(a).chain():a},I=function(a,c){m.prototype[a]=function(){var a=i.call(arguments);G.call(a,this._wrapped);return t(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),
+function(a){var b=k[a];m.prototype[a]=function(){b.apply(this._wrapped,arguments);return t(this._wrapped,this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return t(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.chain=function(){this._chain=true;return this};m.prototype.value=function(){return this._wrapped}})();
diff --git a/underscore.js b/underscore.js
index 913278837..eee91067d 100644
--- a/underscore.js
+++ b/underscore.js
@@ -1,4 +1,4 @@
-//     Underscore.js 1.1.7
+//     Underscore.js 1.2.0
 //     (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.7';
+  _.VERSION = '1.2.0';
 
   // Collection Functions
   // --------------------
@@ -315,14 +315,6 @@
     return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
   };
 
-  // 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);
-  };
-
   // Returns everything but the last entry of the array. Especcialy useful on
   // the arguments object. Passing **n** will return all the values in
   // the array, excluding the last N. The **guard** check allows it to work with
@@ -337,6 +329,14 @@
     return (n != null) && !guard ? slice.call(array, array.length - n) : array[array.length - 1];
   };
 
+  // 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);
+  };
+
   // Trim out all falsy values from an array.
   _.compact = function(array) {
     return _.filter(array, function(value){ return !!value; });