Browse Source

Fix arc focus from legend event - #652

pull/681/head
Masayuki Tanaka 10 years ago
parent
commit
a1370f4e41
  1. 8
      c3.js
  2. 2
      c3.min.js
  3. 4
      src/arc.js
  4. 4
      src/legend.js

8
c3.js

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

2
c3.min.js vendored

File diff suppressed because one or more lines are too long

4
src/arc.js

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

4
src/legend.js

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

Loading…
Cancel
Save