fix dc-js#243

tttp · Aug 22, 2013 · 64f7482 · 64f7482
1 parent 3608550
commit 64f7482
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 19 deletions.
diff --git a/dc.js b/dc.js
@@ -366,6 +366,8 @@ dc.utils.createLegendable = function (chart, group, index, accessor) {
     if (typeof chart.colors === 'function') legendable.color = chart.colors()(index);
     return legendable;
 };
+
+dc.utils.safeNumber = function(n){return isNaN(n)?0:n;};
 dc.events = {
     current: null
 };
@@ -2461,7 +2463,7 @@ dc.barChart = function (parent, chartGroup) {
     };
 
     function barHeight(d) {
-        return Math.abs(_chart.y()(d.y + d.y0) - _chart.y()(d.y0));
+        return dc.utils.safeNumber(Math.abs(_chart.y()(d.y + d.y0) - _chart.y()(d.y0)));
     }
 
     function renderBars(layer, d, i) {
@@ -2480,15 +2482,15 @@ dc.barChart = function (parent, chartGroup) {
             .attr("x", function (d) {
                 var x = _chart.x()(d.x);
                 if (_centerBar) x -= _barWidth / 2;
-                return  x;
+                return  dc.utils.safeNumber(x);
             })
             .attr("y", function (d) {
                 var y = _chart.y()(d.y + d.y0);
 
                 if (d.y < 0)
                     y -= barHeight(d);
 
-                return y;
+                return dc.utils.safeNumber(y);
             })
             .attr("width", _barWidth)
             .attr("height", function (d) {
@@ -2660,7 +2662,7 @@ dc.lineChart = function (parent, chartGroup) {
 
         dc.transition(layers.select("path.line"), _chart.transitionDuration())
             .attr("d", function (d) {
-                return line(d.points);
+                return safeD(line(d.points));
             });
     }
 
@@ -2683,16 +2685,20 @@ dc.lineChart = function (parent, chartGroup) {
                     return _chart.colors()(i);
                 })
                 .attr("d", function (d) {
-                    return area(d.points);
+                    return safeD(area(d.points));
                 });
 
             dc.transition(layers.select("path.area"), _chart.transitionDuration())
                 .attr("d", function (d) {
-                    return area(d.points);
+                    return safeD(area(d.points));
                 });
         }
     }
 
+    function safeD(d){
+        return d.indexOf("NaN") >= 0 ? "M0,0" : d;
+    };
+
     function drawDots(layersEnter) {
         if (!_chart.brushOn()) {
             layersEnter.each(function (d, i) {
@@ -2728,10 +2734,10 @@ dc.lineChart = function (parent, chartGroup) {
                     .append("title").text(_chart.title());
 
                 dots.attr("cx", function (d) {
-                    return _chart.x()(d.x);
+                    return dc.utils.safeNumber(_chart.x()(d.x));
                 })
                     .attr("cy", function (d) {
-                        return _chart.y()(d.y + d.y0);
+                        return dc.utils.safeNumber(_chart.y()(d.y + d.y0));
                     })
                     .select("title").text(_chart.title());
 

diff --git a/dc.min.js b/dc.min.js
diff --git a/src/bar-chart.js b/src/bar-chart.js
@@ -40,7 +40,7 @@ dc.barChart = function (parent, chartGroup) {
     };
 
     function barHeight(d) {
-        return Math.abs(_chart.y()(d.y + d.y0) - _chart.y()(d.y0));
+        return dc.utils.safeNumber(Math.abs(_chart.y()(d.y + d.y0) - _chart.y()(d.y0)));
     }
 
     function renderBars(layer, d, i) {
@@ -59,15 +59,15 @@ dc.barChart = function (parent, chartGroup) {
             .attr("x", function (d) {
                 var x = _chart.x()(d.x);
                 if (_centerBar) x -= _barWidth / 2;
-                return  x;
+                return  dc.utils.safeNumber(x);
             })
             .attr("y", function (d) {
                 var y = _chart.y()(d.y + d.y0);
 
                 if (d.y < 0)
                     y -= barHeight(d);
 
-                return y;
+                return dc.utils.safeNumber(y);
             })
             .attr("width", _barWidth)
             .attr("height", function (d) {

diff --git a/src/line-chart.js b/src/line-chart.js
@@ -57,7 +57,7 @@ dc.lineChart = function (parent, chartGroup) {
 
         dc.transition(layers.select("path.line"), _chart.transitionDuration())
             .attr("d", function (d) {
-                return line(d.points);
+                return safeD(line(d.points));
             });
     }
 
@@ -80,16 +80,20 @@ dc.lineChart = function (parent, chartGroup) {
                     return _chart.colors()(i);
                 })
                 .attr("d", function (d) {
-                    return area(d.points);
+                    return safeD(area(d.points));
                 });
 
             dc.transition(layers.select("path.area"), _chart.transitionDuration())
                 .attr("d", function (d) {
-                    return area(d.points);
+                    return safeD(area(d.points));
                 });
         }
     }
 
+    function safeD(d){
+        return d.indexOf("NaN") >= 0 ? "M0,0" : d;
+    };
+
     function drawDots(layersEnter) {
         if (!_chart.brushOn()) {
             layersEnter.each(function (d, i) {
@@ -125,10 +129,10 @@ dc.lineChart = function (parent, chartGroup) {
                     .append("title").text(_chart.title());
 
                 dots.attr("cx", function (d) {
-                    return _chart.x()(d.x);
+                    return dc.utils.safeNumber(_chart.x()(d.x));
                 })
                     .attr("cy", function (d) {
-                        return _chart.y()(d.y + d.y0);
+                        return dc.utils.safeNumber(_chart.y()(d.y + d.y0));
                     })
                     .select("title").text(_chart.title());
 

diff --git a/src/utils.js b/src/utils.js
@@ -188,3 +188,5 @@ dc.utils.createLegendable = function (chart, group, index, accessor) {
     if (typeof chart.colors === 'function') legendable.color = chart.colors()(index);
     return legendable;
 };
+
+dc.utils.safeNumber = function(n){return isNaN(n)?0:n;};