Skip to content

C
c3-closed
Commit fb515433 authored by Masayuki Tanaka's avatar Masayuki Tanaka
Browse files
Options

Fix null data in arc event listener

parent 23f80e70
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 36 deletions
c3.js
View file @ fb515433
...@@ -4922,18 +4922,22 @@ ...@@ -4922,18 +4922,22 @@
return; return;
} }
updated = $$.updateAngle(d); updated = $$.updateAngle(d);
arcData = $$.convertToArcData(updated); if (updated) {
// transitions arcData = $$.convertToArcData(updated);
$$.expandArc(updated.data.id); // transitions
$$.api.focus(updated.data.id); $$.expandArc(updated.data.id);
$$.toggleFocusLegend(updated.data.id, true); $$.api.focus(updated.data.id);
$$.config.data_onmouseover(arcData, this); $$.toggleFocusLegend(updated.data.id, true);
$$.config.data_onmouseover(arcData, this);
}
} : null) } : null)
.on('mousemove', config.interaction_enabled ? function (d) { .on('mousemove', config.interaction_enabled ? function (d) {
var updated = $$.updateAngle(d), var updated = $$.updateAngle(d), arcData, selectedData;
if (updated) {
arcData = $$.convertToArcData(updated), arcData = $$.convertToArcData(updated),
selectedData = [arcData]; selectedData = [arcData];
$$.showTooltip(selectedData, this); $$.showTooltip(selectedData, this);
}
} : null) } : null)
.on('mouseout', config.interaction_enabled ? function (d) { .on('mouseout', config.interaction_enabled ? function (d) {
var updated, arcData; var updated, arcData;
...@@ -4941,19 +4945,25 @@ ...@@ -4941,19 +4945,25 @@
return; return;
} }
updated = $$.updateAngle(d); updated = $$.updateAngle(d);
arcData = $$.convertToArcData(updated); if (updated) {
// transitions arcData = $$.convertToArcData(updated);
$$.unexpandArc(updated.data.id); // transitions
$$.api.revert(); $$.unexpandArc(updated.data.id);
$$.revertLegend(); $$.api.revert();
$$.hideTooltip(); $$.revertLegend();
$$.config.data_onmouseout(arcData, this); $$.hideTooltip();
$$.config.data_onmouseout(arcData, this);
}
} : null) } : null)
.on('click', config.interaction_enabled ? function (d, i) { .on('click', config.interaction_enabled ? function (d, i) {
var updated = $$.updateAngle(d), var updated = $$.updateAngle(d), arcData;
if (updated) {
arcData = $$.convertToArcData(updated); arcData = $$.convertToArcData(updated);
if ($$.toggleShape) { $$.toggleShape(this, arcData, i); } if ($$.toggleShape) {
$$.config.data_onclick.call($$.api, arcData, this); $$.toggleShape(this, arcData, i);
}
$$.config.data_onclick.call($$.api, arcData, this);
}
} : null) } : null)
.each(function () { $$.transiting = true; }) .each(function () { $$.transiting = true; })
.transition().duration(duration) .transition().duration(duration)
......
c3.min.js
View file @ fb515433
This source diff could not be displayed because it is too large. You can view the blob instead.
src/arc.js
View file @ fb515433
...@@ -265,18 +265,22 @@ c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransf ...@@ -265,18 +265,22 @@ c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransf
return; return;
} }
updated = $$.updateAngle(d); updated = $$.updateAngle(d);
arcData = $$.convertToArcData(updated); if (updated) {
// transitions arcData = $$.convertToArcData(updated);
$$.expandArc(updated.data.id); // transitions
$$.api.focus(updated.data.id); $$.expandArc(updated.data.id);
$$.toggleFocusLegend(updated.data.id, true); $$.api.focus(updated.data.id);
$$.config.data_onmouseover(arcData, this); $$.toggleFocusLegend(updated.data.id, true);
$$.config.data_onmouseover(arcData, this);
}
} : null) } : null)
.on('mousemove', config.interaction_enabled ? function (d) { .on('mousemove', config.interaction_enabled ? function (d) {
var updated = $$.updateAngle(d), var updated = $$.updateAngle(d), arcData, selectedData;
if (updated) {
arcData = $$.convertToArcData(updated), arcData = $$.convertToArcData(updated),
selectedData = [arcData]; selectedData = [arcData];
$$.showTooltip(selectedData, this); $$.showTooltip(selectedData, this);
}
} : null) } : null)
.on('mouseout', config.interaction_enabled ? function (d) { .on('mouseout', config.interaction_enabled ? function (d) {
var updated, arcData; var updated, arcData;
...@@ -284,19 +288,25 @@ c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransf ...@@ -284,19 +288,25 @@ c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransf
return; return;
} }
updated = $$.updateAngle(d); updated = $$.updateAngle(d);
arcData = $$.convertToArcData(updated); if (updated) {
// transitions arcData = $$.convertToArcData(updated);
$$.unexpandArc(updated.data.id); // transitions
$$.api.revert(); $$.unexpandArc(updated.data.id);
$$.revertLegend(); $$.api.revert();
$$.hideTooltip(); $$.revertLegend();
$$.config.data_onmouseout(arcData, this); $$.hideTooltip();
$$.config.data_onmouseout(arcData, this);
}
} : null) } : null)
.on('click', config.interaction_enabled ? function (d, i) { .on('click', config.interaction_enabled ? function (d, i) {
var updated = $$.updateAngle(d), var updated = $$.updateAngle(d), arcData;
if (updated) {
arcData = $$.convertToArcData(updated); arcData = $$.convertToArcData(updated);
if ($$.toggleShape) { $$.toggleShape(this, arcData, i); } if ($$.toggleShape) {
$$.config.data_onclick.call($$.api, arcData, this); $$.toggleShape(this, arcData, i);
}
$$.config.data_onclick.call($$.api, arcData, this);
}
} : null) } : null)
.each(function () { $$.transiting = true; }) .each(function () { $$.transiting = true; })
.transition().duration(duration) .transition().duration(duration)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment