Ensure _.throttle clears the timeout when func is called. [closes #…

…86] Former-commit-id: 6f3b777aa247f059d97f965c02323d4ee6ab8464
lodash · Oct 9, 2012 · fd79056 · fd79056
1 parent db3b429
commit fd79056
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/lodash.js b/lodash.js
@@ -3468,6 +3468,7 @@
       thisArg = this;
 
       if (remain <= 0) {
+        clearTimeout(timeoutId);
         lastCalled = now;
         result = func.apply(thisArg, args);
       }

diff --git a/test/test.js b/test/test.js
@@ -1597,6 +1597,31 @@
 
       throttled();
     });
+
+    asyncTest('should clear timeout when `func` is called', function() {
+      var now = new Date,
+          times = [];
+
+      var throttled = _.throttle(function() {
+        times.push(new Date - now);
+      }, 20);
+
+      setTimeout(throttled, 20);
+      setTimeout(throttled, 20);
+      setTimeout(throttled, 40);
+      setTimeout(throttled, 40);
+
+      setTimeout(function() {
+        var actual = _.every(times, function(value, index) {
+          return index
+            ? (value - times[index - 1]) > 15
+            : true;
+        });
+
+        ok(actual);
+        QUnit.start();
+      }, 120);
+    });
   }());
 
   /*--------------------------------------------------------------------------*/