Fix flow

0d8ac04b · Masayuki Tanaka · ff60d03d · 0d8ac04b · 0d8ac04b · 0d8ac04b
Commit 0d8ac04b authored Mar 08, 2015 by Masayuki Tanaka
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

c3.js c3.js +2 -2

c3.min.js c3.min.js +0 -0

core.js src/core.js +2 -2

No files found.
--- a/c3.js
+++ b/c3.js
@@ -638,7 +638,7 @@
            flow = $$.generateFlow({
                targets: targetsToShow,
                flow: options.flow,
-                duration: duration,
+                duration: options.flow.duration,
                drawBar: drawBar,
                drawLine: drawLine,
                drawArea: drawArea,
@@ -650,7 +650,7 @@
            });
        }

-        if (duration && $$.isTabVisible()) { // Only use transition if tab visible. See #938.
+        if ((duration || flow) && $$.isTabVisible()) { // Only use transition if tab visible. See #938.
            // transition should be derived from one transition
            d3.transition().duration(duration).each(function () {
                var transitionsToWait = [];

--- a/c3.min.js
+++ b/c3.min.js
--- a/src/core.js
+++ b/src/core.js
@@ -633,7 +633,7 @@ c3_chart_internal_fn.redraw = function (options, transitions) {
        flow = $$.generateFlow({
            targets: targetsToShow,
            flow: options.flow,
-            duration: duration,
+            duration: options.flow.duration,
            drawBar: drawBar,
            drawLine: drawLine,
            drawArea: drawArea,
@@ -645,7 +645,7 @@ c3_chart_internal_fn.redraw = function (options, transitions) {
        });
    }

-    if (duration && $$.isTabVisible()) { // Only use transition if tab visible. See #938.
+    if ((duration || flow) && $$.isTabVisible()) { // Only use transition if tab visible. See #938.
        // transition should be derived from one transition
        d3.transition().duration(duration).each(function () {
            var transitionsToWait = [];