From 0dc733a96ce758f22e61d22222264d2593474a78 Mon Sep 17 00:00:00 2001 From: Jukka Kurkela Date: Thu, 18 Nov 2021 00:09:25 +0200 Subject: [PATCH] Configure all datasets before updating any (#9872) * Update misleading sample comment * Configure all datasets before updating any --- src/controllers/controller.doughnut.js | 3 -- src/core/core.controller.js | 4 +++ src/core/core.datasetController.js | 3 +- .../doughnut-full-to-semi.js | 33 ++++++++++++++++++ .../doughnut-full-to-semi.png | Bin 0 -> 21562 bytes test/specs/controller.radar.tests.js | 7 ++-- 6 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 test/fixtures/controller.doughnut/doughnut-full-to-semi.js create mode 100644 test/fixtures/controller.doughnut/doughnut-full-to-semi.png diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js index 3e0da3335..2be27615b 100644 --- a/src/controllers/controller.doughnut.js +++ b/src/controllers/controller.doughnut.js @@ -250,9 +250,6 @@ export default class DoughnutController extends DatasetController { meta = chart.getDatasetMeta(i); arcs = meta.data; controller = meta.controller; - if (controller !== this) { - controller.configure(); - } break; } } diff --git a/src/core/core.controller.js b/src/core/core.controller.js index ce6fbc7a8..cfa3ad937 100644 --- a/src/core/core.controller.js +++ b/src/core/core.controller.js @@ -540,6 +540,10 @@ class Chart { return; } + for (let i = 0, ilen = this.data.datasets.length; i < ilen; ++i) { + this.getDatasetMeta(i).controller.configure(); + } + for (let i = 0, ilen = this.data.datasets.length; i < ilen; ++i) { this._updateDataset(i, isFunction(mode) ? mode({datasetIndex: i}) : mode); } diff --git a/src/core/core.datasetController.js b/src/core/core.datasetController.js index 1794c7031..ccbba2320 100644 --- a/src/core/core.datasetController.js +++ b/src/core/core.datasetController.js @@ -401,6 +401,7 @@ export default class DatasetController { const scopes = config.getOptionScopes(this.getDataset(), scopeKeys, true); this.options = config.createResolver(scopes, this.getContext()); this._parsing = this.options.parsing; + this._cachedDataOpts = {}; } /** @@ -659,8 +660,6 @@ export default class DatasetController { */ _update(mode) { const meta = this._cachedMeta; - this.configure(); - this._cachedDataOpts = {}; this.update(mode || 'default'); meta._clip = toClip(valueOrDefault(this.options.clip, defaultClip(meta.xScale, meta.yScale, this.getMaxOverflow()))); } diff --git a/test/fixtures/controller.doughnut/doughnut-full-to-semi.js b/test/fixtures/controller.doughnut/doughnut-full-to-semi.js new file mode 100644 index 000000000..3e7058a8c --- /dev/null +++ b/test/fixtures/controller.doughnut/doughnut-full-to-semi.js @@ -0,0 +1,33 @@ +module.exports = { + description: 'https://github.com/chartjs/Chart.js/issues/9832', + config: { + type: 'doughnut', + data: { + datasets: [{ + label: 'Set 1', + data: [50, 50, 25], + backgroundColor: ['#BF616A', '#D08770', '#EBCB8B'], + borderWidth: 0 + }, + { + label: 'Se1 2', + data: [50, 50, 25], + backgroundColor: ['#BF616A', '#D08770', '#EBCB8B'], + borderWidth: 0 + }] + }, + options: { + rotation: -90 + } + }, + options: { + canvas: { + width: 512, + height: 512 + }, + run(chart) { + chart.options.circumference = 180; + chart.update(); + } + } +}; diff --git a/test/fixtures/controller.doughnut/doughnut-full-to-semi.png b/test/fixtures/controller.doughnut/doughnut-full-to-semi.png new file mode 100644 index 0000000000000000000000000000000000000000..0585b4922f0bbd217f9a47e306cd0999dec665e4 GIT binary patch literal 21562 zc-rjx^s445Xw%1nI7!gp~9I>6S*iOS+v`{=N{*Jd{kGJBY-@C000021$k*r000E|_rbwJUrxQo zuhAEvo2Hy3pnQmW8vvjOC`e0adztRdI1qv$08jw``=*Y91Ni}1C ze?k8j^nXGB7xaHY|9=TWVS~7b9&~NwtTu7^CGT|jrbyP{e0pFZWFnqKIg2ZO8lFsS zB=u!mLfMEtz#Fj!iN~O)xOu2vg6{|e_JEZ}I-XLE4;Ln&8N5zMvOVI>2f~@Z)Xc&2 zb*~;un`El6Vc7RhGY$;*j?$}6882?iJ^fLAM6BjD04hL!|L|H1?C^GQ?AlY&I$jcs z^*PSa!&cA(RA@QJY|<3Bp;$1ZXeDOq zqEAs+DBePIdI=)0v&mGMrkecruvo3nM@vo780EY1KoQ*H%~cqXsZBJfo=GpMO5N>^BeT6A?L z!@m04c?kuT1%p~h%`rxV1+px^z%TfG*flA|52H+Vx*|~x{KINtVC^aeL@mUGJ+ju| zcWsye!@D0W84DC3dw`z?6V`SSD$H9TdFH4bQst2mx%bdd`(kA9v7jCu80rMl$J;XO zPpmb0?>9I-6E%Ay$fi~d&%vAqU?MY=iv&PaRJ+H*`J;FMW1OE>n1WRTtB2H1cr2%u z8s7RjgilGlEwt}$O%`ImjB3!gpr81Aw|`WWB_}3ka!lwz*LJRvC?1dO3w>}Uwv?s3 z4T-u;3Lvh-21|0XBmW%wEul+RSY^ybAL6BnAV4tpx94bbRxa0VV>k%AC&0Nw`idD? zRL`iXhlfFpDna5#@!_vK>7MYpjlL7N>X>GYj{s01q?5d&4=^(-&i?LwRqLK;C30?^ zOnKd^6b!Udg&&bf(~(!v%Cd~N_k&Z}!B(o-=#bMHR|^VoW7}k$W0`sa9ZDZL=}aQZQB06Dq)mNSYdLqq4GU1|c(6A=c}QTSIZ{ zi8EI*Y%YqDvzvDRKLI>Hs=O;w@-6M5f{Ex7EhjL;WubSNn98Vt>ERrb!6A|1vRR+w zGj__PAKR;AX3*f#RZ6F1@w+WUh^^I0-qQZ0FvlReeS!_^uuL%%o_^F_q203{EG4ki z%Su>lNfF9~1=CCdN+K`z)>@38S zi{vL6+c6mUokXGH@>fsPo8Cj|*mWMLvl?6&ddVrB97}sVDdpOW;c~IDp$rvl{I^dc zHJlpdQX1^Co5t1?ia?H;oa0#BS{XcVN_qnU+5;qtT;p~?mxG3PGxn@}XrPzH`7s(! zjL9iUt-qBE%YyabE}=Nr?xfk$XA>(D22#Aq_{>FcSJ1Fv3JwwOgBQBQID0eu@>%1b zpyNti)>ss9ILcbjUmC5rX&;dh<34lQ(IDicB=^p&SXKGV)a@dLnn`>-V#c<25SQ7q zB_y!1Mh(48|F>4~6y_|l;yyZZ0uXVsl9?2Ej2$uyyK2Udch!Hi6^q!R%k}xQCFEJx z$je~GV}efWHaq>`m9X$>ZOhS=68*~U3f-rn?RFur+@;H{-tCMJZ?)*>K}da!(T03s zMcTF458IRczJC0GcT?gHGvfSL=|VJDGZ%_(!|3xG2eI@QKApw#WrH719yN zR<^v8lVkVZ%3X4g0teV5`>*JAzE#T3`lV-VX!M)x^Dey)Cw<{|>UvN91`UNF`5<2A z!Fh8=9LNSborlT{O+1s@XN{M�Y=)55C6|Tz99638i0(Y31rc7zJqD7+<_&#HKol zi;GoW)2EdJn&Fo0Lwf>$Ntv8<4c#vPX^qVM>GMAwxRRZdA$-01W;l4~S!r{A8#m|~ zvrJ|;vhVr@)^H(051he_jd|G+bNS8B6;-BlEN5&FxYb}DmYMOf{0puu1O^X#asFrz zTDHtJj!FSG>pt%K}A3a;+v3;W~ORs^QY=HWhG>>klOIb<6souA_Rlq}iiRLG&N@q1ufXqKr zG&jb*YC1})k&fZ=AK6b_NFZKvO9s=|-$vcY??;6hct|QBmB2$=OA!)1yR-36I+C7v zzx2#XDX8fTiHC4AcZp@gB!GHo2;~SVw^Pl&>!2{s{PO8a5uJ^SzID^ee!HUXl_za7 zU_Oxk{$NI0D(vbze<0k#*j9Fx1$vl`kX%)tE3Vv(&TJ`}52Sp);*M7dl&`NG?sEE8 zK19AYS(XEYw+^>IJU7;fxuD9brGf{UxtY&F+>`*KAL5hDwDnc`mXX|NENM68MO2Zp`}{f0_*w`HOU zm;d7FQgkX>T*NE*r)(|=db_&YnQouena9E-jkCm_j>$x=9W@{Kq*A74e9}Y-fOc+= z9~|}CM8&BC&ss8Danpm&70|4ieR=EVYNs+UF5wcDUa@f&F_e|~dXxxLBkotnbCx9o z;3nCxWb=&@13bD@`*?f~OY{ykWw!@|lFj(fro9ADc_Wlh--T?)A)VFNdeya=3Idsi z;6dg%EQgyMRC>{0+`7$z6Nsw?GteXfsEC?On{_Jb`wL^icTN*6N;ZM9yS+)M_7#c8 zMhhl72+Lt>q3d1A3|?~LvoGjJf%K>L+peGH(qXtt0LGMFJ*#q;I~w`QVTvW67R#&- zfZSG)J<^LqW*;=aOV0-2RswO)mb+$!WCS^ zT9cL3!*4q}|5mh4`^#?zfSH3tvygFle5l{u--IYuhI!qWFAZ7Z)d7k_P?mTeppL&D z=9uiT;bl}b_~%D07z&I2S#&C8!I_0T&pE0~j4Lr0VaY53ZjxH4u zeTvQ67NcXul!%@}TKwS)hV{=z4x@RMRorsN{=ig38z%I^^K8+d%#3%h<@-O>Q=x4+ zo&{#s-4S6HdvnyFLOS{ZL9EY6k3J$KrxfR|e{VT)d-XFjP!Tgx0SG^P&m`Gwc5>bb zfVMYtD?yZsM z51=8UcLO1>fgBC)11g@kVs08=gn6j|DRvbxF}k}&ob@;(OUL6G`)@%B_TF3%TEzR< zsLv8X(U20z+Qyi0HDm0mdAcK@?Ylo>y+{h7|L0{AAo1UIj$>A3$)W zAPax*EtUEfHGEIBApWr$Jy}*xS?b~~FCFVK=c{sy@C?QAf(|7kun;%!7=j*K17|K287%q z8SVeCW!>fNWn`!|YXw$`QPne4DLnlES--E z0li_Pci^j40;DFcoXp}>U15?0`B>TfnapSTxq)Db7@v14m&xv8+;Olh+G3^ZKR z#ZUbrCtY9GM-E@qGOu8XBzp{lg{DS?yIm{519^QW+qrL8-&Az>VbRNw*=8E2RCw=* zYbc5ydmJR8IT;bH8wqu8I_R!;8BKH=|v34`8>|+9b z_V#3k#)NNACD7bTcbK6?*I+w~t2^iTp(jV|QRf&hhq}9@b>U|+#T}}Q{i$@etlFGE z+FyZy%dnsBlNxAmwWup2j-yH@&yqRjVm}ONCXNYbioHDln=V3?O9*<4F%k}=nVvr& zCSK-U^LIY&D>Vo`w%F%Mz!mL$Th?kPVXCgtAIv9-5isA%92b3ek@qLp>(T5T;8!o` zbXcDwLy#0?^s7!>)OIM7ikHWmXu|?yq@RtetW>x^Obk;#yY?Fm2RKyblTS9tfu*uRf` z#We*nf@qx67HTE+BoP^9eQ&Rw& zyfx()tH}5&2;z?8p6SM$3L0`mWIpT2WAO5*rit_Q5fibpl3HQ~ufSfBZ!M4|WFv4` zYF-a~4Lt!Rs?Ls~6&F2E;1x5@dU}U@K1*Hck~{p-j9;;}`Xw&AZRT>i_G9Y`OzBFK zi2y9;_lTr~mM0<1-l}k&&FIvY!*|2rjh~2V0Hb;mS_!ctUNSqg5FUL;#0*xR>P!m) zCll!Y3~<%yZX|_%@}VB-x8beB#I*M}0jEnl!+tnPfy@`gq_vT9gQk_^e>C2Sz2XOm zj^`9M?)MXk&<~ZVT^?m3Bt0ROrn%reS09+uJE)Q;lyIG}Rv%o}{?WRz5#tBQmFgOuO=N4}-T~p$YBGGHy5NlZ$!{1V zz|qlp?tFz~t(St|XCvih5{r)x>CwI?%sdk`llLMlF5tTC2XYG{!6oQ_9&C9ZIoD!6 z1EBudc-B|e-BG6t|1~r8nNA#s<(y@20%YfGb}>7=&m6arBs+8@H5)w&26i%$%`-+S z-ls1Gdqx(iPt3pm^Xj3-iCh0u9s>p+J{6)P$<2Fk;_1p0L)_(6$yWWp$Ugvk^&T5o z=?uY81HQWZo0lm@gV%4sKOPr2f-8xGNBs;EqW1h#6|3fDZ}+OIDMY7IUI%+|Q6b`V zJZ9FX9>s>Qs5$$Z9dLVwwmQrlM?$(JG#|3A@)(wDb*G|&1N12XBK#CTE6l|aFgAM;LUQd5TTOQfzEw~xO8*d+0Z>y1%= z^>z60$xHBu{z}Aq$eMzY%fLM|&gD@h%C4?!c*zJ;97#llz##u`%uvJKtch9d;{~Lm zNt?Z{!O74&k5yZ9yl;J@AYV^L7(?!+cGaqw=G@8#Ed%t1Ia4SQ>fO#bcenD&^7H>a zb&f6%?ZN_}=!(>a`(}vEfWU+6_YT|71QU>uN<$epz-|rZu;R>X8L6kc-{PZHXAsmZ zhaiZ*q4v3CP4Hm;Mc=oP?&Fg^g^qHgwOgLor`?xWODUh2!xc~71QPuWm94-eWa5r2 zCQHLec%2I279clF)**Q%u65#ODvr0+57{H`*$x= z_&2wyC4{fhk^WwhD92$r<~AYzXVdRHRZk(_Oo5AMR92($TfDlD%gqAh`BiBT zEP;Qudsg!v<4TBg%h~GM`&?`p;MooKUFF-yH~n&hPe5BOhh3Twl2=bKz{Ekfw*Bg190Q;1ZLq`pRv%7KtW<-z2B z$8JkcXBee)$c)5!(YPJQ=$%(VD1Zd&yIB5>=lVMe=K$cpyTo%7tQzco$|OM^MG}UZ=y~N{*v5y{%5Er`$>`ZoVYW5|pr< zMhylqOz>xXwCLv|_ZD*`LWLvg;|{B=MYzR(^qW=7jJ!*K~GP?`B5n7JH8jH_KpLGg6WYv zM&<4I((d;%l2qXK7y)B_6ud@lGA2=F<(q@%6DvTgDN$3 zhM@`8@to~5$9_MHVXdvHJUwT)0gkiF_N@3@4Y&NLLRh3K+VLs zze-Sc1DnmhMTOv0Kjw=$XmH}|gh8U^Aw&^$?t}O7AAn~R3|08Ay4^gjR37Yu>;Py> z?2}||?SH*3h@t(5{>|KmU^70d_JARXAJBD&-}v{Sc~Z!Jm$G=!;IihATd`X!oDaax z^^J3TATb7nFVCEI^p?Gj)%{aMH2)|p@k7j2x13zs7h$*aEQFYaMa=)61(2KqzK}-1 z4rC}YBB0lSS2X7~9Zx9yiITp8#?XNAZNkF=CdkdwdGv-h&r2Z}Oe8cJb<{wn)vGYd z3Fw8mx5r;&V}r->E*Bl0!JDHC2(8l z$%@<&BmTM~&Os+6cWmK*??U{PJE*|3*5$Mn!s0H3;02Rx@9K*@9DhONj&Duz5%|Eha;?Us~Vr`^>Jxj$!RBJAkfQCU4M=x}I zbQM^HPj`+slLPC#{5s0EQ-5Y^+${pMr@jT}w9{~PywecD7<~(5<>NRB`OPUJ)-00r z_9*L9NR3zgACT>?F7YiHtob!x=w$a^hU<$Q?k=_`Oa;!?Q{l%R7$ce{z8@my z_8ZfHq>*nLAVVM`e)@US!pFTSwO1IhRUeNRYIz8D&@5|wH+1Qa&Hpqxevg$#uaU{{ zvFJs9?rE65Oh>TTqs*!?|384QKfb@0FOJ##(0Y=w%Pv)g4YHyOHNC&A|K#(r>(niIts&`Mq4$E zzL&(*%70JQ={KM1n9 z0sjhK!%rzbKXqq&!Yx$0nD4#bun8wp-sxl* znr0sye{8)9&o;X&es9TAseEazuBe{b4|vv5y#g|oRKR7ycF}?B7|9g$O(=-+8|+s# zlqsrmy6_9L?;Ba)H$s=9un=Z<7Y+)vu60N@3$R&QlB5$_(!TdmOqZ)YXBHfd_rOG=1i zUCcHadDv)%Op$*7Q6!l(N|1{AND62MVL9a~(T@C5b)_dLerjkSlgi1k`%9ZbIfqw? z{fS6m!|VwG{NG%fESF&Juy|N0$@Bg^^{@nEkCl>~K!Ql+;3ah?Xq!~M#O>`;M2^`I zn@E+p%zaL<3#eBmu1K5PBwK0E`78`XMU8$Z?RO!s5%2LHd4qbNnU+Br^XGeup%B2Jf#Ljw}ie zO5Rl9s2*Cl10ifp(}t;9^*4#zJc_m!_AsDssGc+&}1^t^cageQscL?6Zkk*O>(ds^b1e^Y`5* z?d9x)KMvM~|I66;68LC*&l7fzRZ`KcZVl8J2w8!li76qj*6kg#^tGfWCEK8NCNktj z-EJB!VUzohenl1mU|MOU=a9`|3*$LHHN4A{){PV~d6f^WuIZyOM*w znWL4ALXyPtC|# zOo7j(Z}7avxdt#ahG%-~9wznTtHoYSdNWBz@e{=4&a9cl8eL29YO$cUM{0!ECOfzI za-pCudk805z4MIK>8S8L4L>PCuqA&)@jgsOgl4W=C5hAY5%>l$tAYb`bT!0h*bC2; z(Xh|!5Dd>gghW@Ys5^Y!fL8$6)z8w$yb6Z!Dw1Gj2fxD3r;5p&1U(-2 zJ8_IOzOrf~#c#+6R$n}659$>i1=OgP-n`L7vK2{v*X!~74%uf(@H zmL(BcKi`S5D$>#I`PuF6_jfiQ+6QLi6`fmF^`(mcJrVS$re7sMb@hJAH#&Y>ftS(7 zcB!BZ*U4>GY^}~snYB~=@L$`$>`ToeID$+xP2e!s_Vj+{U+?9oUlrCbdmo8_ z->-+f!lsDMoX;w~d@+l*Q&aQo!4D~=Yj=VbCFPoqr>p6|(T2I1B{`{VD?7vNTBDZs z3D0J1+a(i_0>gj*hBtQJYWZY-5a0~N?Br4%F1_Z6zrFz;#|`^_wf3qSdyI7wrZw>p zp~G*n=V{*c1hHR#7kX+CVZjk5R^eHXeb|#P;8^^3?CL$+>3#G4R}bds4Fg9v2gY7-J;e0T<50d7ezv3!e{avY5Z0Z})qu z4$n69U+2M#N>-|2%}0C$1ErLjugjJwff-auzGolFWlW=E*!#mmNqzVb2dcj((ekZ8 zIV3XyE9Y~L8h-HU`uwawcyjUX2Du9E1 z%`CrzH!Ag^B{{?zTyUPmd>dZD~;VB(bIBW9|P9K0M* zQ|51(q-Ea;QmY2S;SMHT$)}f^UonQy384w&4jJnmY!Q7mzx$|6?&h~_F%G-?xrd{| zP8ITD}PEDi(k)UTh zvp=Z{DE}lr3)~33q?C5ba$kJ289)}`$96bAI3}n6W>E8U#qoB~08~R~G4YN&mdzE` zLlb{v(HoKY>ES%kiiyo>2pP%AQ|6o#-PSl3gJXg=jz!}p4CKj;2}#+T>Zq_CUhMO$ z3pciam^%UWn=s@?)8e5WDEj6TXxPv5dZax541@Rz=08V4^i%6i@8NHkLNyskesl4* z^)sT40F`U$lkMQinNaN!rRD(@r6B6t`(@O9a>Cwo&u~(R%3zS-(ClynlP$Vk;w=%{)2^hI$o#%?tQKrCRWGM|N`+h%3sRg)egHK&%TOK*6=g`8l+NzICPtk~q_8@#{4|Tx42N2*zYP{^_yKXoe19?79ovQk?rCa6Zg<2p+2<(#cxRcd zac%AU1k7hU+6Tt96}i|tvanla!FO&mKi-Un|Nj79(c;gs9^fv?#`m7tfGpG@lREwI zTS}q`_j1P=8t2Ey7oNtK;>x{U39766xpTA2t5TrExVbNSlbfPy_}$9@)_w9AA_$^# zOyyC?q!7W4&6ghrU3G7Y>b`8gbO#Kb+~fK~tw|3xQKOYmeNA1BKugJ-7C{yV0{HG! zQL?RW&kUfwr2f@2gAWvBkGu44nM#unmm6QgXvT&c4#cMFCY1$W(r$SNrBD@9>_>(L z;QUMuwUcl2x6J25-$MgjYUjqVN!h2?I};OW#|DH(^1eGc%KKKL4KlZwnmp z1`6B|DOL3ef55_;$%756moQXMn@>PADS1?=L<6+z)UZ#dy}l?@(5CV6BHsR=G@JSH z-B@2Rx1NjN{S%nFUkNC8M{Dl*HShI1rXbv(oG-+;qHana^Zyy&E{7Mk7Dpyu?#nlIhKPReBo;VW zFcQ_z_T)YuS)zq*58bKzM=*+Fwjc1Aw{HnJq6xKCQx%F#pcHEMj)s}3+d}MMG1kia z$=x9hqX14APuq>W{sMQp`njYavk1e}hLZAN`B}4&PYH9^V%rCA$d6uzoc=rJ?Z^jVoM!A2x|#6<<|jUTnSc~o0TAUilg{%L(7Qew-ee6U-O3uP$RO9r@vNitkLxj^fO- z>@uGm)^)1aKT^O}FJzWN|2%=5&(aWLxQ5ZW)_wo#**DA**d3|AU}LCVFZIituUaF{ zkg3KLYWMc@8EZpEMj}?udf)7F-m#?QPpbFvNG{Ule9jimCN^5GKNI(!PwBi+Gp|zV zAeWLTZ%K1s-J=TdWpfI~(Eo5K$>yU#!uz21Zctp!`(NMXl48@Z{LH3wZJ!|08vkHg zZ`nN$5;i;I#OVVlbiPjwTHWShn0T;XtUddV)-&{l>1L;b+=MxB2d`U=9gse~2;Xl1H5oWdd_bQ|g zaCkRgQCd+UwwzJ{)XMfZul`ue?vD6bHrE=`}K?zbT-QTE66Uz99Mv8XVkcYbO?Li+>n*9;<6*$lHh{Y(oZEUaE7Gj5m>B78CY@Rd3I z8r_Zkl}KW<1#5=?lSpwgAqV|pUvzcIycB+Yp0B>v3>?lZi#$-Zb-bn+26rJ?M&yFd z1k3{Qq#buwpSQd+fqifBle|*O-HWGtNDBa?MzqE17TBfZG7BOLEkB=4_~VwT5&XaR zWuxnJ-?ob#zjK@7W|ob}fn8N4u}^a1FrkAwgDQNCxo~yx^r(jEp^Eq9d8(5;Qr)4z5YhsBa4QOP4X^%vt>6k*$Qzy*lqgFvjoMl|Kj;Jb$+73kUm@Sr}I$C zZIdGVo85fyXtfqkmRz^~BWI&CDck(>7_=j=zbGegOoLKTvxyu1_9S#_a?T$-5AbMh8JoYh`<>ucC>i&y(q zli|iFY>2ecmF?_R1%JBDl2crz7>J9hs8D-9P(TF$7kn$)r*XXVeO}v&e^~YqLY}>n zh1@8zBYBmKt%0KduS4jhNoKL1Hi`H;v?bhOeUuOU5Fw_hQ%MfF|LFmjCNp|N))Y%- zQ}fAyP(k2-)pE)JqlCC_P&ek%V4x_}FsOL#>^rWGLyU=p8RB zr2FW#*-75Zm|pbu0SQk9v@TdbRpF<5v^#f-)>(042h11u&*t4+{2-S)OAQCZg734< zpJLvLWl0GN)RgW;AGf@5iE`VRGFGF1WO z|8?g@L zuHc#H;>-=P7ZZ4ZMBnoyni8f@|Ju9FUUCL+IpYws8k3}NvfYMzH`QkyfdHli7paL)L6#hg@aOTjUNCBu=s`XL~G=V?`6Sjgh= zCufYq={2W~y}>_CQfv9UniBOQh5@##8dWI0ds?sp<|n3wsd3xmSFiV>TT!UV+7qVI z7`f{gvP;A3{`z#E^@+J_-;?!Sc7@z;DgFRjm!_US3%b`^qRsmnvOZWabl4 zQHlQ)j^3plk+m7$#UexE`24)=Youeid={%P!@0guCk2{@AI4T)dPU@B4NaOJ!{$(y zZ98VUhC>1jv;iNF${wTxPQCEKB%~t*C&zW~mt;&Kg5N3XvBkEO05V!=tgDgM)gxI1 zjJG@kILW$b>-?c_Pk)H5Y`>fcgo*ozgn>Td{c{Q5FdG#aK7WkDx|E+7L?>aDwD)-~ zR!*(YPH+6-$wz$ab{^z)TEyY#rw+1oqr0@jrzmP(`jJ+jg?T{v5NdoOTa!3E^umjG z>0Z-DUyY4w?9f#$RH+hJ@=x-J61-~<AYIvpD)t~BL39%!V00GNgM*!wjN=(Ip%faW6CkS-!h(|89FHkV4TXA8aG9Mmk zY2pdqpoMQ77&)sP2BIbLaypxY@)@mQX4{cMb6Z=*VQNh`E-zj(0kjWgaA~V%qB4C#I4EW8Cw>TCmySAeW z*EDG5*P8SP&l(U-Rfb9Ei|?Z|6&n%Rv{dM2*-(7kI`|+rUKX9vve)ozvwJI}lPOXH z&8C5WKeMUj0l*~W)@Id9`V-|-oikw>*;3#i%&2hMkIgjCgRpYWRf$uFJT~TTE7T%z z%*2j9cIGUW8GgUaZjfbx13fWk^@eZs05SUm8`%a>YYG{095KIy#K1f?kAg;e-BGkN zX+`&axj!zfLz5~2DAnuIWpR_iLDp4vzo;HM`3Ddo6CpL925{ZKmB;Vk@>;{ zae#Zdw)nIW3%1&ze<=Ai?>-4liT&K^KK3Fc0qOBWW)J7C#JeJfe#)pW0c0}&T?7|2 z2hjvF(i?12246G@mt9zCO~>JWt!}2Xxqg}?Z*9K4MYZtix3XLd=E$qU_fI&kUSD^d z{=~0y40-m{pQzN1f$g+GL5VzjXEr1w0t6M5&hbBME(Sz1^vj|9T2HzWur>ys`o*?$ zux;{h9wLtL3ySa}g-Z&vr&>HiZmQUuHn$gKq_TsX87n;on{km|?Mgh}F!D|a&d`}O z2PJ{z1H10%Az_Oh+V0m$nBVR?PE7Jw{Wv>dh>|}NNB<{g16#8jYtS6Pzq|?|DiT+6 zoPhTBM0oku!GEhFuM-QX5S9~qgw@YZNr1rGvu9OnjD~v@>JvX~{Vt1B7H-&7Sl~ee zki#m}(@VVB2EOM+RXhb=l6Sk|TCY|_0pBL3{K(!2WfsoRbv6;53Q#St#z^3i0|2CR z|IPx;?EXeRiz>5`1VX%|%y*IAcskCR0(nRBP$WBpYn@zPul{3l3)hE8s=&|2=oAPO z##8Z<*UB;JZsmi7x}Pq4!SIz-Sav}kI-Vw+3H&Jw8n6?g?AN|t810A`_UnFv)>Cdf}w5%eK z7jrhd`HoS)?nE+!*3*kmsz6w&l^#c~mH4m{&$5$jOmzpc9fif2__V-Q97Df&blC~i zSY_M$#>ZJg9hDFITef-k2+)>$bC}KHuqrSE$IQ*`Bok;pKeF_l#>znxydC6rAm47T zr7|gM)7-vxJ)4QMWjAG?48e7jk#5>Ctx=`EE&-8v zb&L^1Ede@Iy$?0t5;o4>CUi0aQJkvpgLG21Hx-cvsO(|V$^ao2k~#hp%{oNd7H=Gf z2TNzc36B8YSy6)%2>1Wy4w7h9uHujmAM)fAJ5V_n)5c?H-?dS7uy3ie-Ck*G)?<>D z212MgMq01yxIvSFTI)_Av}ZuRoRvCDKywrr7cGw`nt?=qVW;`Ed5r|qygA4Q?}|}z zY2_@C7_qgP=mi)acEdP#8dj?RC}^A8Rd_EJk$t&a_n-AznG>=(m;3vfsQ=PRo{%H> zPg(Ly$~NYZ8F8Y41vPX(4marr$pl0SIaDEA!3nFs`CHYnVk5HjMOv5R=Z(Z?&=p|H z1`|J1P~FDWnrIlhqm}-FkyCwEvDN!&-)Nv%@^|&DARAbdtI}aUc%{6&oYUD6u!;R| z03-C%0-|$gi}sq_kN5?RF`Szs=FDFt!Lzk+obKHMuA~H%4ZlxcHd(9Odzy@k{}T9l#ap%@^UaopIxF{zwHRY``2b z6g{($zx383?@Tz>-nyB)ufMr@2uG%+i#c8UnBPMW%TSX#ZU^cKyLV3l*;aKY24OFr ze|~%Iz(KI9VEOh58hQWZ5}=YAD>~ZMZj-eYS9SbJVco^<%GrtRnzj~vWO_ackUw>(c##r%(ch2${Bbr(l7{FE=!I4$K;(c+Xi7%ey9k*dk z&x}kI9Yh^fjP8sLQ9PiNEmlU#msEeJl%2n5P9~(=zMp=Em|Z6lnkwEE;d_08g>sbB znG+~&*hY@$xI!W7^jhdp#~boru63RQ*ZD|0X^ZAj9JtZfyw;t=f0Lfpr!Y$<4A#A3 z%t`%E1dUVxBd#z1hEd9%|MuU6nmiL1R25!Lzsr&{Tdmjm!Mzlm~*> zI?NEJ5k2dVYus;fi4&AohMMV2LHaJ8HJ=(KZBHGYkmnB{^|M_Y=(EyQbK5d&ERIq{ zC>~>=$f4Wwa zJE;JYL;J@Wp>`RGT2= z_Z@5CJoQb!9$D^3#rL^G<-pCmwS~4X&E#K%!NH6>BfHv0}<^aa0z3Xn+!s51YZ$dqq}WqCXda3d^7O-{HK zv#y2z9DF`HaO#hma|j~)Z=$>2{RGiS4xkgG`@&+W9;;>k2_W0X^}DptVYNEjboQ5B zsD#1vzy}aE=B3~g5NB-hEbm(W>-XhgDQ+OT5MVGVl{*{at+x=N{_)$)W*rZ+*Dtfg z?-zW9Ro0Hn)kT2d!&W#c2!BZe*{Cc% zL}+gNvAE#+2D#B`CVz`bs{n*tD*P|MWxrAN_zLkirnf5cFa#Uv%hVH273`RNez9)X}0>Lz1nx8mndm}}MvX5GfW({61iJ#D*LmKRKou@gHvwt$n;km*ZRuMbso$cK zX^k}TZ$1%77k;lf?wXhMvVf@|;2}ytgMIcQa1zNE3QX`n8h=r6FXIcT#fH+l1MqpABAXo<|MCAqt zN(E-Lwjl&*KrotMfM^ksx7Y%s2n(fBVgyMCCu)j8j6sq>G8g(6%$NDZ*R%H7d!4hM zv-W=0I_sCAP*C}z!#r)S0GS}Wf?>R6poX6FbS9kdw7un(1FMBP5J2#p>$gv&cVd(s zLq{(6jfAHg`N-AP;JeYn4^d7?OCT3U#PntU>E>5^>Fu7Uk4gv?x*x}f%inR(gO@GA z_9d(U^oACn%Or|TFA!1zLTZUWw~A&F71cy7(9_?Jh`WH>6`%~05HA0ln)#iP@wmi= z7XPA{Ulro@Q`!ed>RD{-bW!C=iLP(3grbJ;(3JpR&e4jm$Pg>9+qZwm@jtw|_sIC_4o1kO1QFmrFH0vB(QmDRI-*`By zS0_5#E@#D+Cms@e?n$7kG%3k@ME=C{k@QROKIqVav0l3O&()ur8!|l1GUb$f{taEV zWe>+lcK12ZB6V!E5P@fppzVtuXJt$JW-aoFP&u#6EWH*hwEmS=rl*+S#=x$xH)ct{ zFF0FaecZE|?-HsnWn+A&-$dh0iiK*~#rVjOkV5}>&<>?enOTfgnz?rL$R!@o#Bj|1 z_=9hM5#4M9NCn)_Q4~kgy(gRP?=O|P*Ug*G-9eAkL;lzw+G@i+132-+rr9o8PQR}p z|AG_^E%*KqC+&_33L<-aoJ_3{S}@J@H+hH4#g^Ib^IjP*qd^?ryM0z#m(H6#8;ou) zezGBXk~W|rg2w$>^44CoZ)J5VhTZn}gW3oXXgI;*Eq&v#se<^sTs9zb>2&uU>Vr02 zZ-p~oH^DP!1UfY_=1GCwWJ%#LF4g~xp?Z{&f45mX_#cUOtY<4zhIFW7_2Ivco>-oI zxxz?#y)#QLU7>i-kd0pf<=Y^DBNObX?RCDYs1$!)hs-v`xkM-HtOJQhrMXSL7fkM; zI%Wu@kr-J)T?P66gXKmuGud$D>F&gnh;2EA*p|^1Y)oHn;_&9Z9nNrC(B@S>u(H_5uP8l^_o;|-)_6+(%wyF>(+WGGu+^5?guA?HR0bPIX*tPdmfw1eo@=` z5PHFR`p;8xPE~UI!p5K~64|D|J0mCOkAb8`FYhEqnb4B7B?vZPX8H0fSZV5})P7c?jR)zd>ycsH zyh~-1aifeFs`T`oeoNZXJ}~bw#v?S}4N&149z0l%#(Y=bnX#{1Y6|7zgaPfD6I1Ci zPqs<4F3%WX*pOy@GB9Yy2Gv}5Ki)b3p4&jsj$hoHBVUmkyMk8$;W>5&KYJqp}Hg8{w*wj*s~ z>_h@E$59*M`Nd(Zt2d1qqyeh_Rg(ZCI~kyZrn~nGB)}E#_#rU6aM9hH1}jsP;8Jee gdg}Gm|7&W@r%jWu@)zFoK|~6C5}Ody8pSOAFSiq}sQ>@~ literal 0 Hc-jL100001 diff --git a/test/specs/controller.radar.tests.js b/test/specs/controller.radar.tests.js index b87031585..5a6fecb54 100644 --- a/test/specs/controller.radar.tests.js +++ b/test/specs/controller.radar.tests.js @@ -117,7 +117,7 @@ describe('Chart.controllers.radar', function() { var meta = chart.getDatasetMeta(0); - meta.controller.reset(); // reset first + chart.reset(); // reset first // Line element expect(meta.dataset.options).toEqual(jasmine.objectContaining({ @@ -150,8 +150,7 @@ describe('Chart.controllers.radar', function() { })); }); - // Now update controller and ensure proper updates - meta.controller._update(); + chart.update(); [ {x: 256, y: 120, cppx: 246, cppy: 120, cpnx: 272, cpny: 120}, @@ -193,7 +192,7 @@ describe('Chart.controllers.radar', function() { chart.data.datasets[0].pointBorderColor = 'rgb(56, 57, 58)'; chart.data.datasets[0].pointBorderWidth = 1.123; - meta.controller._update(); + chart.update(); expect(meta.dataset.options).toEqual(jasmine.objectContaining({ backgroundColor: 'rgb(98, 98, 98)', -- 2.47.3