From cdac7fe5b6988d73b0e20bb14abd7fda94899e13 Mon Sep 17 00:00:00 2001
From: Suhaib Khan <suheb.work@gmail.com>
Date: Sat, 15 Jul 2017 13:49:16 +0530
Subject: [PATCH] Fix labelOffset not working for vertical axes (#4249)

---
 src/core/core.scale.js                        |   2 +-
 .../label-offset-vertical-axes.json           |  41 ++++++++++++++++++
 .../core.scale/label-offset-vertical-axes.png | Bin 0 -> 4434 bytes
 test/specs/core.scale.tests.js                |   3 ++
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/core.scale/label-offset-vertical-axes.json
 create mode 100644 test/fixtures/core.scale/label-offset-vertical-axes.png
 create mode 100644 test/specs/core.scale.tests.js

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index 5d8d82576a6..2938385cdc1 100644
--- 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
new file mode 100644
index 00000000000..dbd979ecd8e
--- /dev/null
+++ 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
new file mode 100644
index 0000000000000000000000000000000000000000..2f6b18c8c23939f2b79177a937ba2458298f826b
GIT binary patch
literal 4434
zcmeHLSy)qN8b0SV!9cKt9gEnoC`3d+78gJdlr>6(&_}5SO`(dQECmXvG$dLTw}O%?
zB0@%%!GeHVh=7=gQk8;Qz=dKU>VPN)u!yXZ`EriEotr*0H`A-+KYaW5zVCm+p&*Xm
zT&+*E5CoYU;P1^v5DdPe2u%Y%nzQdlA&Bn00B_IF(>5!gNVCkM3^f$-DQ31^d##%E
zL^rKiVy|=O5_OC3>zgO&<$s#Gk!GG<mW@$WsLf$z<8?>2A3Mf78x!GFwhtP|Eq?4R
zeB9${deOEj>G|nBNiQ0r?z&e>>v~t-b8El0Lm3w`V~Gn86r(J%zP~OmlCIArjy~v!
z9z*?AsHtUx=xfVcC^R_Z=*Y+a<HtNXmG@84rDH!rk%e9gMTq-gFh<#}RndUt+m_@j
zcS$0lv{0*rkLW0NgKmS|Fl`Vb!aj<Dpzmt_qUsX@tXl8PK^ns(2uDpAkNosk7zH6$
z=@go`eh_kQVMKul)52Rq?R<Ehn3k;UxzkK2_+GTy%E3BxgOJjkn!x2YVq_<y_W^~r
z!~lFvD2r(}h+%fPr$EL9A8y#k`k{e18rs$tLZN9}ixKUp!5qzeFxsqvQO;@FAiwE3
zu4kiE=GKan77j5emDl-Z9)Ah=hMrhvEqn=<9d~{&HHGM|nZq#{#R#UpSsOEiO0;fQ
zGI1UYd{|2lYE~=~BNhGqER1ph%0F;<><)!PF+l7;Lb2b#c>AGT>k<K$y==o;U6UFC
z=J0AldyNtJE(tiDBTEL0mtV(r%!TNtH&b0uj7|k#4WSl{fco`D2D4fO<1#pPgR%jl
zZ%7(7fSE%1H@c?2#;h?d!6_K+b};_gyETW4qyF>COK3+o!C=2lKk(@h$ak{1HGsDY
z8cV)Z`%;5yAej5CArBGm2VdiTI2EOeu}ikFFE)(p@ULHC<q*BRZr5Q%_!NqJy7Rkb
zLVc7f`xO`9&M>b{7X1M%F;aZ=0hi)yCq|C0T74tS2lB1u_FFlaL1U}F=uX}T`83{y
z2MT0f;CsYVyjOq)p<RZsuZ3b{Npqir@Bu`B@WkCmAWHz_gxb}oWrqZqVk;A8<_R!{
zo$hEc44?Z;3=1m)eE6CbKD}iD`4+O0^m2cI#?Ds6)_X#}eG`?7aNa+_x0xB_iKAtL
z*IF3mq+Sqm@>yc8EC!;-#1&ZJycJ-);>*Hy3U6S|G6s_Y2+2H|xr+<KXGPW+2!jEv
zML*mdi3F7WazeCHbDbZK=5ijo%EdAdx-4Y9N6q_@8#-$mYih<0+HS0zxqK_%twf|;
z@M69>E|6Jk&KH~Gyfoo{s$znk(Oqlr5;(fOyLQXzdoMD~`16+&L`5+d3dc}TWIv;`
zdP32B;lhPeY*v<;ju`38Y%(KAEiRDxQ56Gp)n_^$Z_k!S^LM{6=2OL+8F3bb7PwIJ
z8XFtq%@!<}y&9c&Yt73D)ki^2da1gEK0Kx78E;8{a~vWU4bK#^O7g!*F2Nkq8F8eN
zxKKHK4aMY(!Zp&y#`nRx+w=N6*Z*OQxLAH;46*~f+^mR{Qb(HT_U=<EmF|_aFf|bN
zB><w~uVt)}Lm6{;@$thKYhyDW)+!}ySzE?-2wWonbl)HzwMXx6yL>BNUOzUpqpI=U
z-Rh!=WVJIB7oWtV&@z|IJ?aCf*>1qD$ByM>=?-wnwbAw>^zRh_ajZh_O&pqlkYAm1
zpphj2p*t_9=o1H;r5O4CP!sdd$<@<k99Cavp>Cz*@EIbBY=HW4Ol<WKmQX25tbI5#
z1j_>Lx<iTU{M`>NTc}(>ly)D`oNT(%lgQT&$zNL3Fo+ZbfWP`<`Q-Rs!Z4DLZ^~3l
zG%XnrBlqQytt3PB_5OBb!S%qjI7@4y0DKh?C%o8*+@2iFB**oMdYNZI8kTbDWczVI
z#_rpiL^atQAhYrL{bT@%0J|UiFA7nOKXhMwq|=LR_)8oea82AxR8tHR(e4vt{&zcn
zWjjT7h?>+x?>{V@VnmzY$&LQOzCP{Ev#6Am6n@fpb705J){G35b&W=%4zU%c!&O-T
z`dBXa*vQ@$b^S+acW-Y-#6<8D0&5gnC+Ja3K*K>|Q4}~}`@b?E78SG>H0w_gGW>Cr
zW^f>wT)Ukx2Mc0HFAcAMTi0OER|x0K?wS0fFLlS<f039~tBo67HX^AL5`h^sb6`W}
zbp{EJN>JTL-LWLpz6Vvc(D;nRYCV83JYGWLjsb^E6KxXtuRsmIZIt^GH1Go2nMXK~
zz$>!_+Kr`{68+N5fl$>U?5@fyU7pPiVLl{nXdm7JE|et|JqxcS5g!edaSq<}JyGIY
z;~-?}%as8i>}`<fb3c=`9<Uc9ZzYK*NGyW}w|htHl33mXD39;6BJmG|FFw?6LAEFb
zX7siM5N6rFz#07#A98pZz$WRBIb`$4fM<)?N66-9q2CN!YfbeD{{*-hC^8~7;XSZ+
zb^}L`kS1p^%d@c~)o2Qs{{BL~6|v608-jTk|Md+C8|b*xnKpj<^gCtwqsnl%0hOb*
zbt;?HZR;+1Wm(>O<yClr<%f|EEkXRY%v8AsI_>Cww_Xz8%TH|9%htF>0)bgB`v%>f
zlA2m2;-+L7$9BKV8keW`=2Tt%qh-$*rzGUnmiv<|7+o=SSC!b|yob){S(Vh^x?ChU
ze{I3LMUX~Vf%)}LO2gQbvmQq2gK*W)OpOgbQso$4-%Q|$7lXC+^z?MZcF)#}F4b(G
zge%ao@Lq<qi^((znpW)7_u8_Zu6s(O^9Jc`nf>_qct-9#Ssdwq7_*jAs~Z}o<=mE<
z=X&>RmA{To&ddq%zUV}N`}Wd=SHs9_rP3ocEp4Kl+tN3g&aWz@-yVusLt=cBA~HiW
z!S&2{v8xMJb)xpto+pW9>?Uk*Hbkah`tvFxlt~u6Bo$PwV-rk!sD4d7);@=1{2So)
z^E)lYq+=|+BK>aj9eLUPXE&htYZ15h)@A<V0G%ezHV1W4{%S2yU#_nETeqFMa<OYr
z&QT}r0ygDp+9Hlgj)qWDJ0x{1`W%Vqk68QxKM}s?k(;f}pR0oat#2OXqM4_UoCgA{
zxtuw#1Y<ZEhd|9tATYy;O=WIdS_+~<uy&hB3vUfu2g)N<Q?=E`P>@@fdl(X{`I#HM
z`0vF3Pow?-&5nVcamV+yg)6tIp_#i^1}}sLt*`wF7WmpH{DinqzrI}9sG6O&KgBJu
zDVZsX&KnMI+&vaw)Z0#Q4Bq8g!VoIY^-SY$&TY$wSG*aP^zx_a@z*B%?MNaE@C9m%
z)YS2_+?G1GM{e%!GwtP7*QUnZZM(^fj&Wr=1L5~Nx9xWe?U`2W(^;*W8my9LsR0U=
z-L_0fMJEzjeUiWq_x4)lG<-;;Qk8GPx3T1vLz}Oe{#t@84ZD)iKQlSH<?61{erfuP
z;f3T~wURpX3GZ%LEP3+|!H=>uPvYj2QGj=v2jaF8&A{V1|E<R(Ywqu?U}UE+HiiF{
OAOSuc?@BM;-hTspg1-I$

literal 0
HcmV?d00001

diff --git a/test/specs/core.scale.tests.js b/test/specs/core.scale.tests.js
new file mode 100644
index 00000000000..58e5a33faeb
--- /dev/null
+++ b/test/specs/core.scale.tests.js
@@ -0,0 +1,3 @@
+describe('Core.scale', function() {
+	describe('auto', jasmine.specsFromFixtures('core.scale'));
+});