do not draw undefined points for lineChart. Closes dc-js#330

tttp · Oct 10, 2013 · 0688648 · 0688648
1 parent 26fe7d3
commit 0688648
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 2 deletions.
diff --git a/dc.js b/dc.js
@@ -3785,6 +3785,7 @@ dc.lineChart = function (parent, chartGroup) {
             layers.each(function (d, i) {
                 var layer = d3.select(this);
                 var points = layer.datum().points;
+                if (_defined) points = points.filter(_defined);
 
                 var g = tooltips.select("g." + TOOLTIP_G_CLASS + "._" + i);
                 if (g.empty()) g = tooltips.append("g").attr("class", TOOLTIP_G_CLASS + " _" + i);

diff --git a/dc.min.js b/dc.min.js
diff --git a/dc.min.js.map b/dc.min.js.map
diff --git a/src/line-chart.js b/src/line-chart.js
@@ -172,6 +172,7 @@ dc.lineChart = function (parent, chartGroup) {
             layers.each(function (d, i) {
                 var layer = d3.select(this);
                 var points = layer.datum().points;
+                if (_defined) points = points.filter(_defined);
 
                 var g = tooltips.select("g." + TOOLTIP_G_CLASS + "._" + i);
                 if (g.empty()) g = tooltips.append("g").attr("class", TOOLTIP_G_CLASS + " _" + i);

diff --git a/test/line-chart-test.js b/test/line-chart-test.js
@@ -377,6 +377,28 @@ suite.addBatch({
     }
 });
 
+suite.addBatch({
+    'defined hides undefined points': {
+        topic: function () {
+            var chart = buildChart("chart-defeined");
+            chart.defined(function(d) { return d.x.valueOf() != 1339311600000;});
+            chart.brushOn(false);
+            chart.render();
+            return chart;
+        },
+        'path should be broken where not defined': function (chart) {
+            assert.notEqual(chart.select("path.line").attr("d").indexOf("M",1),-1);
+        },
+        'dots should not be drawn on undefined points': function (chart) {
+            assert.equal(chart.selectAll(".dot").size(),5);
+        },
+        teardown: function (topic) {
+            resetAllFilters();
+            resetBody();
+        }
+    }
+});
+
 suite.addBatch({
     'horizontal grid lines drawing': {
         topic: function () {

diff --git a/web/js/dc.js b/web/js/dc.js
@@ -3785,6 +3785,7 @@ dc.lineChart = function (parent, chartGroup) {
             layers.each(function (d, i) {
                 var layer = d3.select(this);
                 var points = layer.datum().points;
+                if (_defined) points = points.filter(_defined);
 
                 var g = tooltips.select("g." + TOOLTIP_G_CLASS + "._" + i);
                 if (g.empty()) g = tooltips.append("g").attr("class", TOOLTIP_G_CLASS + " _" + i);