Fix wild special zero grid line when undefined (#4700)

Remove the special drawing for an undefined zero grid line since it causes issue when the first tick is not aligned on the scale extremity (ie only linear scales now display a special grid line for the origin). Hide scales in the filler plugin unit test fixtures to avoid future failures due to changes unrelated to the tested features.
chartjs · Aug 26, 2017 · 5a014dc · 5a014dc
1 parent 488cbbc
commit 5a014dc
Show file tree

Hide file tree

Showing 33 changed files with 31 additions and 97 deletions.
diff --git a/src/core/core.scale.js b/src/core/core.scale.js
@@ -680,7 +680,7 @@ module.exports = function(Chart) {
 
 				var label = tick.label;
 				var lineWidth, lineColor, borderDash, borderDashOffset;
-				if (index === (typeof me.zeroLineIndex !== 'undefined' ? me.zeroLineIndex : 0) && (options.offset === gridLines.offsetGridLines)) {
+				if (index === me.zeroLineIndex && options.offset === gridLines.offsetGridLines) {
 					// Draw the first index specially
 					lineWidth = gridLines.zeroLineWidth;
 					lineColor = gridLines.zeroLineColor;

diff --git a/test/fixtures/plugin.filler/fill-line-boundary-end-span.json b/test/fixtures/plugin.filler/fill-line-boundary-end-span.json
@@ -24,14 +24,10 @@
             "title": false,
             "scales": {
                 "xAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }],
                 "yAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }]
             },
             "elements": {

diff --git a/test/fixtures/plugin.filler/fill-line-boundary-end-span.png b/test/fixtures/plugin.filler/fill-line-boundary-end-span.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-end.json b/test/fixtures/plugin.filler/fill-line-boundary-end.json
@@ -24,14 +24,10 @@
             "title": false,
             "scales": {
                 "xAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }],
                 "yAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }]
             },
             "elements": {

diff --git a/test/fixtures/plugin.filler/fill-line-boundary-end.png b/test/fixtures/plugin.filler/fill-line-boundary-end.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-span.json b/test/fixtures/plugin.filler/fill-line-boundary-origin-span.json
@@ -24,14 +24,10 @@
             "title": false,
             "scales": {
                 "xAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }],
                 "yAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }]
             },
             "elements": {

diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-span.png b/test/fixtures/plugin.filler/fill-line-boundary-origin-span.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.json b/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.json
@@ -24,14 +24,10 @@
             "title": false,
             "scales": {
                 "xAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }],
                 "yAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }]
             },
             "elements": {

diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.png b/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline.json b/test/fixtures/plugin.filler/fill-line-boundary-origin-spline.json
@@ -24,14 +24,10 @@
             "title": false,
             "scales": {
                 "xAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }],
                 "yAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }]
             },
             "elements": {

diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-spline.png b/test/fixtures/plugin.filler/fill-line-boundary-origin-spline.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.json b/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.json
@@ -24,14 +24,10 @@
             "title": false,
             "scales": {
                 "xAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }],
                 "yAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }]
             },
             "elements": {

diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.png b/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.json b/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.json
@@ -24,14 +24,10 @@
             "title": false,
             "scales": {
                 "xAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }],
                 "yAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }]
             },
             "elements": {

diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.png b/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin.json b/test/fixtures/plugin.filler/fill-line-boundary-origin.json
@@ -24,14 +24,10 @@
             "title": false,
             "scales": {
                 "xAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }],
                 "yAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }]
             },
             "elements": {

diff --git a/test/fixtures/plugin.filler/fill-line-boundary-origin.png b/test/fixtures/plugin.filler/fill-line-boundary-origin.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-start-span.json b/test/fixtures/plugin.filler/fill-line-boundary-start-span.json
@@ -24,14 +24,10 @@
             "title": false,
             "scales": {
                 "xAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }],
                 "yAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }]
             },
             "elements": {

diff --git a/test/fixtures/plugin.filler/fill-line-boundary-start-span.png b/test/fixtures/plugin.filler/fill-line-boundary-start-span.png
diff --git a/test/fixtures/plugin.filler/fill-line-boundary-start.json b/test/fixtures/plugin.filler/fill-line-boundary-start.json
@@ -24,14 +24,10 @@
             "title": false,
             "scales": {
                 "xAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }],
                 "yAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }]
             },
             "elements": {

diff --git a/test/fixtures/plugin.filler/fill-line-boundary-start.png b/test/fixtures/plugin.filler/fill-line-boundary-start.png
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-span.json b/test/fixtures/plugin.filler/fill-line-dataset-span.json
@@ -32,14 +32,10 @@
             "title": false,
             "scales": {
                 "xAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }],
                 "yAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }]
             },
             "elements": {

diff --git a/test/fixtures/plugin.filler/fill-line-dataset-span.png b/test/fixtures/plugin.filler/fill-line-dataset-span.png
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline-span.json b/test/fixtures/plugin.filler/fill-line-dataset-spline-span.json
@@ -32,14 +32,10 @@
             "title": false,
             "scales": {
                 "xAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }],
                 "yAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }]
             },
             "elements": {

diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline-span.png b/test/fixtures/plugin.filler/fill-line-dataset-spline-span.png
diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline.json b/test/fixtures/plugin.filler/fill-line-dataset-spline.json
@@ -32,14 +32,10 @@
             "title": false,
             "scales": {
                 "xAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }],
                 "yAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }]
             },
             "elements": {

diff --git a/test/fixtures/plugin.filler/fill-line-dataset-spline.png b/test/fixtures/plugin.filler/fill-line-dataset-spline.png
diff --git a/test/fixtures/plugin.filler/fill-line-dataset.json b/test/fixtures/plugin.filler/fill-line-dataset.json
@@ -32,14 +32,10 @@
             "title": false,
             "scales": {
                 "xAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }],
                 "yAxes": [{
-                    "ticks": {
-                        "display": false
-                    }
+                    "display": false
                 }]
             },
             "elements": {

diff --git a/test/fixtures/plugin.filler/fill-line-dataset.png b/test/fixtures/plugin.filler/fill-line-dataset.png
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.json b/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.json
@@ -22,12 +22,7 @@
             "legend": false,
             "title": false,
             "scale": {
-                "pointLabels": {
-                    "fontSize": 0
-                },
-                "ticks": {
-                    "display": false
-                }
+                "display": false
             },
             "elements": {
                 "point": {

diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.png b/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.png
diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin.json b/test/fixtures/plugin.filler/fill-radar-boundary-origin.json
@@ -22,12 +22,7 @@
             "legend": false,
             "title": false,
             "scale": {
-                "pointLabels": {
-                    "fontSize": 0
-                },
-                "ticks": {
-                    "display": false
-                }
+                "display": false
             },
             "elements": {
                 "point": {

diff --git a/test/fixtures/plugin.filler/fill-radar-boundary-origin.png b/test/fixtures/plugin.filler/fill-radar-boundary-origin.png