playground
/
c3
mirror of https://github.com/masayuki0812/c3.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Fix null data in arc event listener

pull/1207/head
Masayuki Tanaka 10 years ago
parent
23f80e70dd
commit
fb51543383
3 changed files with 57 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      c3.js
  2. 2
      c3.min.js
  3. 16
      src/arc.js

16
c3.js
Unescape View File

@ -4922,18 +4922,22 @@
return; return;
} }
updated = $$.updateAngle(d); updated = $$.updateAngle(d);
if (updated) {
arcData = $$.convertToArcData(updated); arcData = $$.convertToArcData(updated);
// transitions // transitions
$$.expandArc(updated.data.id); $$.expandArc(updated.data.id);
$$.api.focus(updated.data.id); $$.api.focus(updated.data.id);
$$.toggleFocusLegend(updated.data.id, true); $$.toggleFocusLegend(updated.data.id, true);
$$.config.data_onmouseover(arcData, this); $$.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,6 +4945,7 @@
return; return;
} }
updated = $$.updateAngle(d); updated = $$.updateAngle(d);
if (updated) {
arcData = $$.convertToArcData(updated); arcData = $$.convertToArcData(updated);
// transitions // transitions
$$.unexpandArc(updated.data.id); $$.unexpandArc(updated.data.id);
@ -4948,12 +4953,17 @@
$$.revertLegend(); $$.revertLegend();
$$.hideTooltip(); $$.hideTooltip();
$$.config.data_onmouseout(arcData, this); $$.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) {
$$.toggleShape(this, arcData, i);
}
$$.config.data_onclick.call($$.api, arcData, this); $$.config.data_onclick.call($$.api, arcData, this);
}
} : null) } : null)
.each(function () { $$.transiting = true; }) .each(function () { $$.transiting = true; })
.transition().duration(duration) .transition().duration(duration)

2
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
src/arc.js
Unescape View File

@ -265,18 +265,22 @@ c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransf
return; return;
} }
updated = $$.updateAngle(d); updated = $$.updateAngle(d);
if (updated) {
arcData = $$.convertToArcData(updated); arcData = $$.convertToArcData(updated);
// transitions // transitions
$$.expandArc(updated.data.id); $$.expandArc(updated.data.id);
$$.api.focus(updated.data.id); $$.api.focus(updated.data.id);
$$.toggleFocusLegend(updated.data.id, true); $$.toggleFocusLegend(updated.data.id, true);
$$.config.data_onmouseover(arcData, this); $$.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,6 +288,7 @@ c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransf
return; return;
} }
updated = $$.updateAngle(d); updated = $$.updateAngle(d);
if (updated) {
arcData = $$.convertToArcData(updated); arcData = $$.convertToArcData(updated);
// transitions // transitions
$$.unexpandArc(updated.data.id); $$.unexpandArc(updated.data.id);
@ -291,12 +296,17 @@ c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransf
$$.revertLegend(); $$.revertLegend();
$$.hideTooltip(); $$.hideTooltip();
$$.config.data_onmouseout(arcData, this); $$.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) {
$$.toggleShape(this, arcData, i);
}
$$.config.data_onclick.call($$.api, arcData, this); $$.config.data_onclick.call($$.api, arcData, this);
}
} : null) } : null)
.each(function () { $$.transiting = true; }) .each(function () { $$.transiting = true; })
.transition().duration(duration) .transition().duration(duration)

Write Preview
Loading…
Cancel
Save