Fixed #5631, zeroes in logarithmic chart made the whole graph crash.

highcharts · Aug 30, 2016 · 7b4ceac · 7b4ceac
1 parent 5203670
commit 7b4ceac
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 8 deletions.
diff --git a/js/highcharts.src.js b/js/highcharts.src.js
@@ -14571,8 +14571,7 @@
 
                 // Discard disallowed y values for log axes (#3434)
                 if (yAxis.isLog && yValue !== null && yValue <= 0) {
-                    point.y = yValue = null;
-                    error(10);
+                    point.isNull = true;
                 }
 
                 // Get the plotX translation

diff --git a/js/highmaps.src.js b/js/highmaps.src.js
@@ -14052,8 +14052,7 @@
 
                 // Discard disallowed y values for log axes (#3434)
                 if (yAxis.isLog && yValue !== null && yValue <= 0) {
-                    point.y = yValue = null;
-                    error(10);
+                    point.isNull = true;
                 }
 
                 // Get the plotX translation

diff --git a/js/highstock.src.js b/js/highstock.src.js
@@ -14571,8 +14571,7 @@
 
                 // Discard disallowed y values for log axes (#3434)
                 if (yAxis.isLog && yValue !== null && yValue <= 0) {
-                    point.y = yValue = null;
-                    error(10);
+                    point.isNull = true;
                 }
 
                 // Get the plotX translation

diff --git a/js/parts/Series.js b/js/parts/Series.js
@@ -721,8 +721,7 @@ Series.prototype = {
 
 			// Discard disallowed y values for log axes (#3434)
 			if (yAxis.isLog && yValue !== null && yValue <= 0) {
-				point.y = yValue = null;
-				error(10);
+				point.isNull = true;
 			}
 
 			// Get the plotX translation

diff --git a/samples/unit-tests/series/data-null/demo.details b/samples/unit-tests/series/data-null/demo.details
@@ -0,0 +1,5 @@
+---
+ resources:
+   - https://code.jquery.com/qunit/qunit-1.19.0.js
+   - https://code.jquery.com/qunit/qunit-1.19.0.css
+...
diff --git a/samples/unit-tests/series/data-null/demo.html b/samples/unit-tests/series/data-null/demo.html
@@ -0,0 +1,7 @@
+<script src="https://code.highcharts.com/stock/highstock.js"></script>
+
+
+<div id="qunit"></div>
+<div id="qunit-fixture"></div>
+
+<div id="container" style="width: 600px; margin: 0 auto"></div>
diff --git a/samples/unit-tests/series/data-null/demo.js b/samples/unit-tests/series/data-null/demo.js
@@ -0,0 +1,43 @@
+$(function () {
+
+    QUnit.test('NaN in graphs', function (assert) {
+        var chart = Highcharts.chart('container', {
+
+            series: [{
+                data: [NaN, 71.5, 106.4, 129.2, 144.0, NaN, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4]
+            }]
+
+        });
+
+        assert.ok(
+            chart.series[0].graph.attr('d').length > 100,
+            'Path is ok'
+        );
+        assert.notEqual(
+            chart.series[0].graph.attr('d'),
+            'M 0 0',
+            'Path is ok'
+        );
+    });
+
+    QUnit.test('Zeroes on log axis', function (assert) {
+
+        var chart = Highcharts.chart('container', {
+
+            yAxis: {
+                type: 'logarithmic'
+            },
+
+            series: [{
+                data: [1, 2, 0, 8, 16, 32, 64, 128, 256, 512],
+                pointStart: 1
+            }]
+        });
+
+        assert.strictEqual(
+            chart.series[0].graph.attr('d').split(' ')[6],
+            'M',
+            'Gap detected'
+        );
+    });
+});