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

Author: jashkenas

.npmignore

@@ -2,3 +2,5 @@ test/
 Rakefile
 docs/
 raw/
+index.html
+underscore-min.js

index.html

@@ -340,7 +340,7 @@
       <a href="http://prototypejs.org/doc/latest/">Prototype.js</a>
       (or <a href="http://www.ruby-doc.org/core/classes/Enumerable.html">Ruby</a>),
       but without extending any of the built-in JavaScript objects. It's the
-      tie to go along with <a href="http://docs.jquery.com">jQuery</a>'s tux,
+      tie to go along with <a href="http://jquery.com">jQuery</a>'s tux,
       and <a href="http://backbonejs.org">Backbone.js</a>'s suspenders.
     </p>
 
@@ -1043,7 +1043,7 @@ <h2 id="functions">Function (uh, ahem) Functions</h2>
       <p id="debounce">
         <b class="header">debounce</b><code>_.debounce(function, wait, [immediate])</code>
         <br />
-        Creates and returns a new debounced version of the passed function that
+        Creates and returns a new debounced version of the passed function which
         will postpone its execution until after
         <b>wait</b> milliseconds have elapsed since the last time it
         was invoked. Useful for implementing behavior that should only happen
@@ -1486,7 +1486,8 @@ <h2 id="utility">Utility Functions</h2>
         <b class="header">times</b><code>_.times(n, iterator, [context])</code>
         <br />
         Invokes the given iterator function <b>n</b> times. Each invocation of
-        <b>iterator</b> is called with an <tt>index</tt> argument.
+        <b>iterator</b> is called with an <tt>index</tt> argument. Produces an
+        array of the returned values.
         <br />
         <i>Note: this example uses the <a href="#chaining">chaining syntax</a></i>.
       </p>

test/functions.js

@@ -241,6 +241,14 @@ $(document).ready(function() {
     equal(num, 1);
   });
 
+  test("Recursive onced function.", 1, function() {
+    var f = _.once(function(){
+      ok(true);
+      f();
+    });
+    f();
+  });
+
   test("wrap", function() {
     var greet = function(name){ return "hi: " + name; };
     var backwards = _.wrap(greet, function(func, name){ return func(name) + ' ' + name.split('').reverse().join(''); });

underscore.js

@@ -1,6 +1,7 @@
 //     Underscore.js 1.4.4
 //     http://underscorejs.org
-//     (c) 2009-2013 Jeremy Ashkenas, DocumentCloud Inc.
+//     (c) 2009-2011 Jeremy Ashkenas, DocumentCloud Inc.
+//     (c) 2011-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
 //     Underscore may be freely distributed under the MIT license.
 
 (function() {
@@ -21,11 +22,12 @@
   var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
 
   // Create quick reference variables for speed access to core prototypes.
-  var push             = ArrayProto.push,
-      slice            = ArrayProto.slice,
-      concat           = ArrayProto.concat,
-      toString         = ObjProto.toString,
-      hasOwnProperty   = ObjProto.hasOwnProperty;
+  var
+    push             = ArrayProto.push,
+    slice            = ArrayProto.slice,
+    concat           = ArrayProto.concat,
+    toString         = ObjProto.toString,
+    hasOwnProperty   = ObjProto.hasOwnProperty;
 
   // All **ECMAScript 5** native function implementations that we hope to use
   // are declared here. We don't use native implementations of the array extras
@@ -235,7 +237,7 @@
 
   // Return the maximum element or (element-based computation).
   // Can't optimize arrays of integers longer than 65,535 elements.
-  // See: https://bugs.webkit.org/show_bug.cgi?id=80797
+  // See [WebKit Bug 80797](https://bugs.webkit.org/show_bug.cgi?id=80797)
   _.max = function(obj, iterator, context) {
     if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) {
       return Math.max.apply(Math, obj);
@@ -486,16 +488,8 @@
   // `[['a',1],['b',2],['c',3]]` returns the array
   // [['a','b','c'],[1,2,3]].
   _.unzip = function(tuples) {
-      var results = [];
-      _.each(tuples, function (tuple, tupleIndex) {
-          _.each(tuple, function (value, itemIndex) {
-              if (results.length <= itemIndex) {
-                  results[itemIndex] = [];
-              }
-              results[itemIndex][tupleIndex] = value;
-          });
-      });
-      return results;
+      var maxLen = _.max(_.pluck(tuples, "length"))
+      return _.times(maxLen, _.partial(_.pluck, tuples));
   };
 
   // Converts lists into objects. Pass either a single array of `[key, value]`
@@ -835,7 +829,7 @@
   // Internal recursive comparison function for `isEqual`.
   var eq = function(a, b, aStack, bStack) {
     // 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.
+    // 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 || b == null) return a === b;