Fix point.show when redraw - #666 #681

5c11d8fc · Masayuki Tanaka · 0533d5bf · 5c11d8fc · 5c11d8fc · 5c11d8fc
Commit 5c11d8fc authored Nov 08, 2014 by Masayuki Tanaka
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

c3.js c3.js +4 -1

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

core.js src/core.js +3 -0

shape.line.js src/shape.line.js +1 -1

No files found.
--- a/c3.js
+++ b/c3.js
@@ -697,6 +697,9 @@
    c3_chart_internal_fn.initialOpacity = function (d) {
        return d.value !== null && this.withoutFadeIn[d.id] ? 1 : 0;
    };
+    c3_chart_internal_fn.initialOpacityForCircle = function (d) {
+        return d.value !== null && this.withoutFadeIn[d.id] ? this.opacityForCircle(d) : 0;
+    };
    c3_chart_internal_fn.opacityForCircle = function (d) {
        return isValue(d.value) && this.config.point_show ? (this.isScatterType(d) ? 0.5 : 1) : 0;
    };
@@ -2901,7 +2904,7 @@
            .attr("r", $$.pointR.bind($$))
            .style("fill", $$.color);
        $$.mainCircle
-            .style("opacity", $$.initialOpacity.bind($$));
+            .style("opacity", $$.initialOpacityForCircle.bind($$));
        $$.mainCircle.exit().remove();
    };
    c3_chart_internal_fn.addTransitionForCircle = function (transitions, cx, cy) {

--- a/c3.min.js
+++ b/c3.min.js
--- a/src/core.js
+++ b/src/core.js
@@ -692,6 +692,9 @@ c3_chart_internal_fn.getTranslate = function (target) {
 c3_chart_internal_fn.initialOpacity = function (d) {
    return d.value !== null && this.withoutFadeIn[d.id] ? 1 : 0;
 };
+c3_chart_internal_fn.initialOpacityForCircle = function (d) {
+    return d.value !== null && this.withoutFadeIn[d.id] ? this.opacityForCircle(d) : 0;
+};
 c3_chart_internal_fn.opacityForCircle = function (d) {
    return isValue(d.value) && this.config.point_show ? (this.isScatterType(d) ? 0.5 : 1) : 0;
 };

--- a/src/shape.line.js
+++ b/src/shape.line.js
@@ -289,7 +289,7 @@ c3_chart_internal_fn.redrawCircle = function () {
        .attr("r", $$.pointR.bind($$))
        .style("fill", $$.color);
    $$.mainCircle
-        .style("opacity", $$.initialOpacity.bind($$));
+        .style("opacity", $$.initialOpacityForCircle.bind($$));
    $$.mainCircle.exit().remove();
 };
 c3_chart_internal_fn.addTransitionForCircle = function (transitions, cx, cy) {