Remove unexposed cascade option

plotly · Aug 23, 2016 · 62277c2 · 62277c2
1 parent c821b1a
commit 62277c2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/components/drawing/index.js b/src/components/drawing/index.js
@@ -69,7 +69,7 @@ drawing.translatePoints = function(s, xa, ya, trace, transitionConfig, joinDirec
                     var trans;
                     if(!joinDirection) {
                         trans = p.transition()
-                        .delay(transitionConfig.delay + transitionConfig.cascade / size * i)
+                        .delay(transitionConfig.delay)
                         .duration(transitionConfig.duration)
                         .ease(transitionConfig.ease)
                         .attr('transform', 'translate(' + x + ',' + y + ')');

diff --git a/src/plot_api/plot_api.js b/src/plot_api/plot_api.js
@@ -2652,7 +2652,7 @@ Plotly.transition = function(gd, data, layout, traceIndices, transitionConfig) {
             basePlotModules[j].plot(gd, transitionedTraces, traceTransitionConfig);
         }
 
-        gd._transitionData._completionTimeout = setTimeout(completeTransition, transitionConfig.duration + transitionConfig.delay);
+        gd._transitionData._completionTimeout = setTimeout(completeTransition, transitionConfig.duration + transitionConfig.delay + 1000);
 
         if(!hasAxisTransition && !hasTraceTransition) {
             return false;
@@ -2662,9 +2662,14 @@ Plotly.transition = function(gd, data, layout, traceIndices, transitionConfig) {
     function completeTransition() {
         flushCallbacks(gd._transitionData._interruptCallbacks);
 
-        gd.emit('plotly_endtransition', []);
-
-        return executeCallbacks(gd._transitionData._cleanupCallbacks);
+        return Promise.resolve().then(function () {
+            if (transitionConfig.redraw) {
+                return Plotly.redraw(gd);
+            }
+        }).then(function () {
+            gd.emit('plotly_endtransition', []);
+            return executeCallbacks(gd._transitionData._cleanupCallbacks);
+        });
     }
 
     function interruptPreviousTransitions() {