From 6654ac11513d7084b10b0c0e68c1912b0d3ddf41 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 16 Aug 2019 11:04:11 +0800
Subject: [PATCH] MDL-66312 js: Autocomplete promises were inside out

The pending promise should nott be resolved until the changes are
complete.
Previously the resolution of the pendingPromise was triggering the other
changes.
---
 lib/amd/build/form-autocomplete.min.js     | Bin 11222 -> 11284 bytes
 lib/amd/build/form-autocomplete.min.js.map | Bin 75363 -> 75713 bytes
 lib/amd/src/form-autocomplete.js           |  11 ++++++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/amd/build/form-autocomplete.min.js b/lib/amd/build/form-autocomplete.min.js
index 549a653ebc18445dff6d160bfa8d5c41b6b360c9..16887499163916ee47b6fe7fbd380162e27f5345 100644
GIT binary patch
delta 82
zcmcZ>J|$uUvy8Y-hHavrOKMtbQBi7&hNg99nns#lX7S{Qa$1v3Wx^RVCVym+n7mX*
h7|NO_#KxtUoLG{ap`lruF*#9Qm&rO~^Fx`hd;pKp95w&|

delta 38
pcmbOdaV>lUv&>{6nNG&k$sbuHCU21uhO!>W@H3`vmY4m?2LKc=4XXeE

diff --git a/lib/amd/build/form-autocomplete.min.js.map b/lib/amd/build/form-autocomplete.min.js.map
index db0aeafd1eb9af9a0ef8cd558119b14a439bea7d..11e43c817ffa106e9c2adeb05e753b20348d1e90 100644
GIT binary patch
delta 1596
zcmZ`)UrbwN6whryP%MzpAsI0%*lap3($dmD>NdXb>+S7rAutLp1qODsv=`O^rKJU9
zF!9fW4>Q>bA$!rp2Oso-&1TWW#JOaNKA4%k`RB!C@lX8Ao6$t^JEtaNiZ9>2-#NeY
zJHK<j^WA&*)4H3V)m?qFp}A=0Gs~soXkj^Tu4SrkH0++KH<(u7FsZvoLQz#Py}*Th
zuz6f`cLX0~5MHjHWh|s>ENn<?Y?G@xV}>V;kR;)B>15~eHOnh-Rj*hNT8c0be$5(0
zH?fO?4tK&ACFXuhCuEIh4zZ4obPb1sGKDTYT#d4DPzo@Zc_7{wR!10HkQjlod>pfR
zxh{b|jut<yIe|1L?8my{FQc(7feIMIl?u^)5$JOCDjv`y-AcN;7<t=rbSaGWULgHz
zLCjM`7QrgjCx^G|ZDs1!L6%$;SuQuVKwC_;m9cA#KucV{iuAgGuLo^#YOE7p9Cft#
z39yJh*2DYYdhBzh1eeD9EI9*ij6dQq2{3|wU5zmobJ59+qXBhmMP7zK#*Zs5=$gpe
z`l&H=9DXF#T-*nPiFUA??QnbIK}*(vFD9OnXj|Of<|K5Mve(!LU@HEol7ULxuf*Y6
zyj@AbCvk@ofS==MY-P$#<q*4GV|QD7Xdp7AvKE$rorGP6y`LCU)}U$f2}@rHZihNx
zKhXrq$%W>AYARKySE8_$JPl3BX6ptq8QAt{0FEa=Jh$TJCB%B%d?mO<3i1aOd++sQ
zUZO-!V63rD%(au5AYJMzXRO3a<fvej#tOiuK2Vn6&nax6V>-|~;HhQvdw3<N4l|a=
z+)KPq^awnEItfiRC0A@6UY&ltrA%V_X!Qs;+??)gcG7M@LqV}3{4jmKL&6e_(bQ=;
zbrCEy8h1l_rb}_cD>KIwSM{x#D~j9<&UQ#S$=SJHk3p%%B$j#jBB~aYiY|qw%YGOv
zgjCwuP55T^Ih!{suSsp>Ce)IYxxw8~oEua8@bR2Oxd=ba-LjdHdt%fc2{OeZ+<NwR
zo0le{*0vNT)pJADJE>n#)kpIuVLN>k>e6AWla47N?*cPiu$!^NM!K~jPraRor!&W3
z_fV80(`sENRBc!mfn`$vVbhgW_$}jPfv~JDIE+OHY521gO2eP!t`G{$QLDYYpLRal
z(VPmGC_--Gv8_@BJF<Y_RX#wl0;gN-rWwSsVd6g2K~RC_{SXiZ6O+bPhL9viOlw1G
zim^Dpm-(0q4`q)iD^+{;oW*j%tZte8n{eda*6n?z{(;)Jc}FxUC#pB@UbFn`YYpsW
zJB)t$@a5<0;Duis;QF^a|AQd+>+f~L?swydLH6EhB#3421lWJ9-#(?ZL13>9F1^&)
R@XsFty1uekPktXb{WmwN>CFHD

delta 1482
zcmZ`(YiOHg6y^=pv})R7(-JqjcD8hvel^XdO)_xvecycfa%tGwG)=FzP1B}Xy4p+9
zCegVfC?ZJ54pRIhD54-DgHIU#5exnlwm;(Vf&+y)aDu;7#?<$m6xMqAb9ldVp7WgN
zT$0`EH9ve&bM+moX<9!#^N8enMQ8@+5y%*xF1{i($>W?nLG|QgXr!*`oTu@b6&n%Q
zZSMhlIBMJPUW0si+lJ|Uj&jy?utt^@X20j9Nb1x+k1wR1<$OW0%do<g1lHUXhN@o@
z=qZ!+D8J6V0#>3YnvzJ!Ia(5D^hII!SPyf<*U=|g+PokAz;Y-T#uk>Sh4mm7DIkU9
z8|H5Ojfd>T=s#JU!~$Ad1H6~e?8OKI2$jdCWTqhD*Jtc-W9Trn40bm36W}~G+${nS
z9=^%e;b_wNv=fDMl4)q&f}blRXs{r&lyVlMhL+$wQIYr_MuV;B1yO|8lU<gIgd+nX
zxR>l|?lmx)M&m~s-6i_M@OINvwOB<4yTh<Fa*9>p{Si-7nZQ}nRIT8FyCbb^4jxVU
z9m86j^Efg|sU<l-htIqigNalp^TAf?OmmS0QP)(>*sInIf7$GCKULT1r{?A{)%YL6
zB%B;=SA?<AA+`!{jh?UsLhyaa0d=uf_;YmF)=O)lVHg`QJr=iZ5^Dr^7W2U;W1rSJ
z-J*!FB5aMfIJ^%Ag~ufqC0%F%J{os4tP@iSAv#})sNta8mMat6EC-h-y3}y4O$2&2
zyj8}sSCoP{iVMh}7f$Jycp$VFUCRlzm;$s;9`_e%kWR8*>7u*sBPH%&o_g?*_3E@?
z-iHX8Sc8j`X;y?=lP$~zzfB%xWq4w$jaAIR)SK*36<a;vQI)_|d6njp75Mqt=^l54
zBn)B1D^#N@MiN4Jz`Bu>T7-viUix4OO4HBVy)iAecdALPsN|Q03#>CktRKc_I@uCj
zn)%$GjcO^*Q^>00QSzKzgw*UGb}!vbRn9Di4QI^Eq<>*bbs}?;1>nWZtgTE7N+|_A
zqI70@t$CXI9F#I`Am+pWLbSuR`NsMSgsPs);s9LAIN<Jog3}Af*mLmOLNE7)Rf9pi
zQyHXRNjKG|UrAO}La1?(cG53;>B~o7n|otigL?}d_3Kd_$^wE{g$J~(BX+<=iED!X
z6ISTp=MXCofM~k}()scL#uEfuh3#wyTQ<$?l*Qs(G#@|ju0ZIO`kh-H%nGMJe%OQ`
z-?hNjm)4!@k15a1pN_*-vlh0#vce0ucMb%uyj(;6$<MmrMx{o5?o8QOBWz!+h3{@3
XhHt-Vet_Tpy$+7tX*6HG6FB`h0z$~p

diff --git a/lib/amd/src/form-autocomplete.js b/lib/amd/src/form-autocomplete.js
index b91dd0ba169..43e32278552 100644
--- a/lib/amd/src/form-autocomplete.js
+++ b/lib/amd/src/form-autocomplete.js
@@ -718,6 +718,7 @@ function($, log, str, templates, notification, LoadingIcon) {
             window.setTimeout(function() {
                 // Get the current element with focus.
                 var focusElement = $(document.activeElement);
+                var timeoutPromise = $.Deferred();
 
                 // Only close the menu if the input hasn't regained focus and if the element still exists,
                 // and regain focus if the scrollbar is clicked.
@@ -727,18 +728,22 @@ function($, log, str, templates, notification, LoadingIcon) {
                     inputElement.focus(); // Probably the scrollbar is clicked. Regain focus.
                 } else if (!focusElement.is(inputElement) && $(document.getElementById(state.inputId)).length) {
                     if (options.tags) {
-                        pendingPromise.then(function() {
+                        timeoutPromise.then(function() {
                             return createItem(options, state, originalSelect);
                         })
                         .catch();
                     }
-                    pendingPromise.then(function() {
+                    timeoutPromise.then(function() {
                         return closeSuggestions(state);
                     })
                     .catch();
                 }
 
-                pendingPromise.resolve();
+                timeoutPromise.then(function() {
+                    return pendingPromise.resolve();
+                })
+                .catch();
+                timeoutPromise.resolve();
             }, 500);
         });
         if (options.showSuggestions) {
-- 
2.17.1