throttle cleanup

Author: kritollm

modules/debounce.js

@@ -6,7 +6,7 @@ import now from './now.js';
 // triggered at the beginning of the sequence instead of at the end.
 export default function debounce(func, wait, immediate) {
   var timeout, timestamp, args, result, context;
-  var later = function () {
+  var later = function() {
     var last = now() - timestamp;
     if (wait > last) {
       timeout = setTimeout(later, wait - last);
@@ -15,8 +15,8 @@ export default function debounce(func, wait, immediate) {
       if (!immediate) result = func.apply(context, args);
     }
   };
-
-  var debounced = function () {
+// Remove timer for immediate, samme as for throttle
+  var debounced = function() {
     var callNow = immediate && !timeout;
     context = this;
     args = [].slice.call(arguments, 0);
@@ -26,7 +26,7 @@ export default function debounce(func, wait, immediate) {
     return result;
   }
 
-  debounced.cancel = function () {
+  debounced.cancel = function() {
     clearTimeout(timeout);
     timeout = null;
   };

modules/throttle.js

@@ -14,7 +14,6 @@ export default function throttle(func, wait, options) {
     previous = options.leading === false ? 0 : now();
     timeout = null;
     result = func.apply(context, args);
-    if (!timeout) context = args = null;
   };
 
   var throttled = function() {
@@ -23,14 +22,14 @@ export default function throttle(func, wait, options) {
     var remaining = wait - (_now - previous);
     context = this;
     args = arguments;
-    if (remaining <= 0 || remaining > wait) {
+    if (remaining <= 0) {
       if (timeout) {
         clearTimeout(timeout);
         timeout = null;
       }
       previous = _now;
       result = func.apply(context, args);
-      if (!timeout) context = args = null;
+      //if (!timeout) context = args = null;
     } else if (!timeout && options.trailing !== false) {
       timeout = setTimeout(later, remaining);
     }
@@ -40,7 +39,7 @@ export default function throttle(func, wait, options) {
   throttled.cancel = function() {
     clearTimeout(timeout);
     previous = 0;
-    timeout = context = args = null;
+    timeout = null;
   };
 
   return throttled;