when using setTimeout, call callback immediately

devrelm · Aug 23, 2016 · 6790537 · 6790537
1 parent 72358d5
commit 6790537
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/throttle.js b/throttle.js
@@ -1,5 +1,8 @@
 function throttle(callback) {
     var running = false;
+    function resetRunning() {
+        running = false;
+    }
 
     return function () {
         if (running) {
@@ -10,13 +13,14 @@ function throttle(callback) {
         var args = arguments;
         function frameHandler() {
             callback.apply(undefined, args);
-            running = false;
+            resetRunning();
         }
 
-        if (requestAnimationFrame) {
-            requestAnimationFrame(frameHandler);
+        if ('requestAnimationFrame' in window) {
+            window.requestAnimationFrame(frameHandler);
         } else {
-            setTimeout(frameHandler, 1000 / 60); // 60 fps
+            callback.apply(undefined, args);
+            window.setTimeout(resetRunning, 1000 / 60); // 60 fps
         }
     };
 }