Fix arc focus from legend event - #652

a1370f4e · Masayuki Tanaka · c0f5426b · a1370f4e · a1370f4e · a1370f4e
Commit a1370f4e authored Nov 03, 2014 by Masayuki Tanaka
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

c3.js c3.js +4 -4

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

arc.js src/arc.js +3 -1

legend.js src/legend.js +1 -3

No files found.
--- a/c3.js
+++ b/c3.js
@@ -3797,9 +3797,7 @@
            })
            .on('mouseout', function (id) {
                $$.d3.select(this).classed(CLASS.legendItemFocused, false);
-                if (!$$.transiting) {
+                $$.api.revert();
-                    $$.api.revert();
-                }
                if (config.legend_item_onmouseout) {
                    config.legend_item_onmouseout.call($$, id);
                }
@@ -4430,7 +4428,9 @@
            interval = window.setInterval(function () {
                if (!$$.transiting) {
                    window.clearInterval(interval);
-                    $$.expandArc(targetIds);
+                    if ($$.legend.selectAll('.c3-legend-item-focused').size() > 0) {
+                        $$.expandArc(targetIds);
+                    }
                }
            }, 10);
            return;

--- a/c3.min.js
+++ b/c3.min.js
--- a/src/arc.js
+++ b/src/arc.js
@@ -127,7 +127,9 @@ c3_chart_internal_fn.expandArc = function (targetIds) {
        interval = window.setInterval(function () {
            if (!$$.transiting) {
                window.clearInterval(interval);
-                $$.expandArc(targetIds);
+                if ($$.legend.selectAll('.c3-legend-item-focused').size() > 0) {
+                    $$.expandArc(targetIds);
+                }
            }
        }, 10);
        return;

--- a/src/legend.js
+++ b/src/legend.js
@@ -225,9 +225,7 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
        })
        .on('mouseout', function (id) {
            $$.d3.select(this).classed(CLASS.legendItemFocused, false);
-            if (!$$.transiting) {
+            $$.api.revert();
-                $$.api.revert();
-            }
            if (config.legend_item_onmouseout) {
                config.legend_item_onmouseout.call($$, id);
            }