Make _.throttle reentrant.

quantaoflight · Apr 29, 2012 · 6e5d5b8 · 6e5d5b8
1 parent c9ab76e
commit 6e5d5b8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/test/functions.js b/test/functions.js
@@ -136,6 +136,16 @@ $(document).ready(function() {
     _.delay(function(){ equal(counter, 2, "incr was called twice"); start(); }, 220);
   });
 
+  asyncTest("functions: throttle recursively", 1, function() {
+    var counter = 0;
+    var incr = _.throttle(function() {
+        counter++;
+        if (counter < 5) incr();
+    }, 100);
+    incr();
+    _.delay(function(){ equal(counter, 3, "incr was throttled"); start(); }, 220);
+  });
+
   asyncTest("functions: debounce", 1, function() {
     var counter = 0;
     var incr = function(){ counter++; };

diff --git a/underscore.js b/underscore.js
@@ -541,10 +541,10 @@
       if (throttling) {
         more = true;
       } else {
+        throttling = true;
         result = func.apply(context, args);
       }
       whenDone();
-      throttling = true;
       return result;
     };
   };