Animation cleanup

rreusser · rreusser · commit aec44c6ecbc6 · 2016-07-08T10:32:35.000-04:00
diff --git a/src/plot_api/plot_api.js b/src/plot_api/plot_api.js
@@ -2540,15 +2540,18 @@ Plotly.transition = function(gd, data, layout, traceIndices, transitionConfig) {
 
         Plots.supplyDefaults(gd);
 
+        // TODO: Add logic that computes animatedTraces to avoid unnecessary work while
+        // still handling things like box plots that are interrelated.
         // doCalcdata(gd, animatedTraces);
+
         doCalcdata(gd);
 
         ErrorBars.calc(gd);
     }
 
     var restyleList = [];
     var completionTimeout = null;
-    var completion = null;
+    var resolveTransitionCallback = null;
 
     function executeTransitions() {
         var j;
@@ -2567,22 +2570,25 @@ Plotly.transition = function(gd, data, layout, traceIndices, transitionConfig) {
         }
 
         return new Promise(function(resolve) {
-            completion = resolve;
+            resolveTransitionCallback = resolve;
             completionTimeout = setTimeout(resolve, transitionConfig.duration);
         });
     }
 
     function interruptPreviousTransitions() {
-        var ret;
+        var ret, interrupt;
         clearTimeout(completionTimeout);
 
-        if(completion) {
-            completion();
+        if(resolveTransitionCallback) {
+            resolveTransitionCallback();
+        }
+
+        while(gd._frameData._layoutInterrupts.length) {
+            (gd._frameData._layoutInterrupts.pop())();
         }
 
-        if(gd._animationInterrupt) {
-            ret = gd._animationInterrupt();
-            gd._animationInterrupt = null;
+        while(gd._frameData._styleInterrupts.length) {
+            (gd._frameData._styleInterrupts.pop())();
         }
         return ret;
     }
diff --git a/src/plots/cartesian/transition_axes.js b/src/plots/cartesian/transition_axes.js
@@ -229,12 +229,12 @@ module.exports = function transitionAxes(gd, newLayout, transitionConfig) {
     return new Promise(function(resolve, reject) {
         var t1, t2, raf;
 
-        gd._animationInterrupt = function() {
+        gd._frameData._layoutInterrupts.push(function() {
             reject();
             cancelAnimationFrame(raf);
             raf = null;
             transitionTail();
-        };
+        });
 
         function doFrame() {
             t2 = Date.now();
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -561,6 +561,14 @@ plots.supplyDefaults = function(gd) {
     if(!gd._frameData._counter) {
         gd._frameData._counter = 0;
     }
+
+    if(!gd._frameData._layoutInterrupts) {
+        gd._frameData._layoutInterrupts = [];
+    }
+
+    if(!gd._frameData._styleInterrupts) {
+        gd._frameData._styleInterrupts = [];
+    }
 };
 
 // helper function to be bound to fullLayout to check
diff --git a/test/image/mocks/animation.json b/test/image/mocks/animation.json
@@ -39,7 +39,7 @@
             }
         }
     }, {
-        "name": 'frame0',
+        "name": "frame0",
         "data": [
             {"y": [0.5, 1.5, 7.5]},
             {"y": [4.25, 2.25, 3.05]}
@@ -48,7 +48,7 @@
         "traceIndices": [0, 1],
         "layout": { }
     }, {
-        "name": 'frame1',
+        "name": "frame1",
         "data": [
             {"y": [2.1, 1, 7]},
             {"y": [4.5, 2.5, 3.1]}
@@ -57,7 +57,7 @@
         "traceIndices": [0, 1],
         "layout": { }
     }, {
-        "name": 'frame2',
+        "name": "frame2",
         "data": [
             {"y": [3.5, 0.5, 6]},
             {"y": [5.7, 2.7, 3.9]}
@@ -66,7 +66,7 @@
         "traceIndices": [0, 1],
         "layout": { }
     }, {
-        "name": 'frame3',
+        "name": "frame3",
         "data": [
             {"y": [5.1, 0.25, 5]},
             {"y": [7, 2.9, 6]}
