throttle.done method and test updates

Author: alexcjohnson

src/lib/index.js

@@ -99,6 +99,7 @@ lib.counterRegex = regexModule.counter;
 
 var throttleModule = require('./throttle');
 lib.throttle = throttleModule.throttle;
+lib.throttleDone = throttleModule.done;
 lib.clearThrottle = throttleModule.clear;
 
 lib.getGraphDiv = require('./get_graph_div');

src/lib/throttle.js

@@ -43,19 +43,40 @@ exports.throttle = function throttle(callback, minInterval, id) {
 
     _clearTimeout(cache);
 
-    if(now > cache.ts + minInterval) {
+    function exec() {
         callback();
-        cache.ts = now;
+        cache.ts = Date.now();
+        if(cache.onDone) {
+            cache.onDone();
+            cache.onDone = null;
+        }
+    }
+
+    if(now > cache.ts + minInterval) {
+        exec();
         return;
     }
 
     cache.timer = setTimeout(function() {
-        callback();
-        cache.ts = Date.now();
+        exec();
         cache.timer = null;
     }, minInterval);
 };
 
+exports.done = function(id) {
+    var cache = timerCache[id];
+    if(!cache || !cache.timer) return Promise.resolve();
+
+    return new Promise(function(resolve) {
+        var previousOnDone = cache.onDone;
+        cache.onDone = function onDone() {
+            if(previousOnDone) previousOnDone();
+            resolve();
+            cache.onDone = null;
+        };
+    });
+};
+
 /**
  * Clear the throttle cache for one or all timers
  * @param {optional string} id:

src/plots/cartesian/select.js

@@ -208,21 +208,23 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
 
     dragOptions.doneFn = function(dragged, numclicks) {
         corners.remove();
-        throttle.clear(throttleID);
-
-        if(!dragged && numclicks === 2) {
-            // clear selection on doubleclick
-            outlines.remove();
-            for(i = 0; i < searchTraces.length; i++) {
-                searchInfo = searchTraces[i];
-                searchInfo.selectPoints(searchInfo, false);
-            }
+        throttle.done(throttleID).then(function() {
+            throttle.clear(throttleID);
 
-            gd.emit('plotly_deselect', null);
-        }
-        else {
-            dragOptions.gd.emit('plotly_selected', eventData);
-        }
+            if(!dragged && numclicks === 2) {
+                // clear selection on doubleclick
+                outlines.remove();
+                for(i = 0; i < searchTraces.length; i++) {
+                    searchInfo = searchTraces[i];
+                    searchInfo.selectPoints(searchInfo, false);
+                }
+
+                gd.emit('plotly_deselect', null);
+            }
+            else {
+                dragOptions.gd.emit('plotly_selected', eventData);
+            }
+        });
     };
 };
 

test/jasmine/tests/gl2d_click_test.js

@@ -496,10 +496,12 @@ describe('@noCI Test gl2d lasso/select:', function() {
     function drag(path) {
         var len = path.length;
 
+        Lib.clearThrottle();
         mouseEvent('mousemove', path[0][0], path[0][1]);
         mouseEvent('mousedown', path[0][0], path[0][1]);
 
         path.slice(1, len).forEach(function(pt) {
+            Lib.clearThrottle();
             mouseEvent('mousemove', pt[0], pt[1]);
         });