Fix labelOffset not working for vertical axes (#4249)

chartjs · Jul 15, 2017 · b03ab1c · b03ab1c
1 parent f16d8a3
commit b03ab1c
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 1 deletion.
diff --git a/src/core/core.scale.js b/src/core/core.scale.js
@@ -647,7 +647,7 @@ module.exports = function(Chart) {
 
 					var yLineValue = me.getPixelForTick(index); // xvalues for grid lines
 					yLineValue += helpers.aliasPixel(lineWidth);
-					labelY = me.getPixelForTick(index, gridLines.offsetGridLines);
+					labelY = me.getPixelForTick(index, gridLines.offsetGridLines) + optionTicks.labelOffset;
 
 					tx1 = xTickStart;
 					tx2 = xTickEnd;

diff --git a/test/fixtures/core.scale/label-offset-vertical-axes.json b/test/fixtures/core.scale/label-offset-vertical-axes.json
@@ -0,0 +1,41 @@
+{
+    "config": {
+        "type": "horizontalBar",
+        "data": {
+            "labels": ["\u25C0", "\u25A0", "\u25C6", "\u25CF"],
+            "datasets": [{
+                "data": [12, 19, 3, 5]
+            }]
+        },
+        "options": {
+            "legend": false,
+            "title": false,
+            "scales": {
+                "xAxes": [{
+                    "ticks": {
+                        "display": false
+                    },
+                    "gridLines":{
+                        "display": false,
+                        "drawBorder": false
+                    }
+                }],
+                "yAxes": [{
+                    "ticks": {
+                        "labelOffset": 25
+                    },
+                    "gridLines":{
+                        "display": false,
+                        "drawBorder": false
+                    }
+                }]
+            }
+        }
+    },
+    "options": {
+        "canvas": {
+            "height": 256,
+            "width": 512
+        }
+    }
+}
diff --git a/test/fixtures/core.scale/label-offset-vertical-axes.png b/test/fixtures/core.scale/label-offset-vertical-axes.png
diff --git a/test/specs/core.scale.tests.js b/test/specs/core.scale.tests.js
@@ -0,0 +1,3 @@
+describe('Core.scale', function() {
+	describe('auto', jasmine.specsFromFixtures('core.scale'));
+});