Browse Source

Skip circle when point.show is false

pull/246/head
Masayuki Tanaka 11 years ago
parent
commit
f62f282069
  1. 30
      c3.js
  2. 2
      c3.min.js

30
c3.js

@ -3330,20 +3330,22 @@
.style('opacity', 0) .style('opacity', 0)
.remove(); .remove();
mainCircle = main.selectAll('.' + CLASS.circles).selectAll('.' + CLASS.circle) if (__point_show) {
.data(lineOrScatterData); mainCircle = main.selectAll('.' + CLASS.circles).selectAll('.' + CLASS.circle)
mainCircle.enter().append("circle") .data(lineOrScatterData);
.attr("class", classCircle) mainCircle.enter().append("circle")
.attr("r", pointR) .attr("class", classCircle)
.style("fill", color); .attr("r", pointR)
mainCircle .style("fill", color);
.style("opacity", initialOpacity) mainCircle
.transition().duration(duration) .style("opacity", initialOpacity)
.style('opacity', opacityForCircle) .transition().duration(duration)
.style("fill", color) .style('opacity', opacityForCircle)
.attr("cx", __axis_rotated ? circleY : circleX) .style("fill", color)
.attr("cy", __axis_rotated ? circleX : circleY); .attr("cx", __axis_rotated ? circleY : circleX)
mainCircle.exit().remove(); .attr("cy", __axis_rotated ? circleX : circleY);
mainCircle.exit().remove();
}
if (hasDataLabel()) { if (hasDataLabel()) {
mainText = main.selectAll('.' + CLASS.texts).selectAll('.' + CLASS.text) mainText = main.selectAll('.' + CLASS.texts).selectAll('.' + CLASS.text)

2
c3.min.js vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save