From 721c29ff2dfe745e944d0a4c1436370f61d20f40 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 27 May 2020 14:52:50 +0800
Subject: [PATCH] MDL-68833 theme_boost: Add ./pending event checks back

---
 theme/boost/amd/build/loader.min.js      | Bin 1289 -> 1399 bytes
 theme/boost/amd/build/loader.min.js.map  | Bin 4358 -> 4814 bytes
 theme/boost/amd/build/pending.min.js     | Bin 845 -> 2107 bytes
 theme/boost/amd/build/pending.min.js.map | Bin 5400 -> 4980 bytes
 theme/boost/amd/src/loader.js            |  75 +++++----
 theme/boost/amd/src/pending.js           | 188 ++++++++++++-----------
 6 files changed, 138 insertions(+), 125 deletions(-)

diff --git a/theme/boost/amd/build/loader.min.js b/theme/boost/amd/build/loader.min.js
index ca24dd7f773ed40ed0859e4d6da85d5efbfd618f..e762a98acfeab79888db4b030a9d4c857b1fcdd5 100644
GIT binary patch
delta 324
zcmXwxJx;_h5QSxuY8yHv1V~XRu!Ttg(SQ|+a>WIx5OVBs;>C$kl3gTL9DoAB%15Dx
zn^1BET4oU`-hA`(<~>h-CU3=RdUDBA<vYmlq1CpnQl4gcuR8DCUpuaExS6+Vu)d{|
zmt1kpfg4`&diDB3bl4-i=a!aCsKQdkghps400B%GgkhpWR7})}8khfpi4B?@ky%*A
zJMU*3n<PBO`@uxl1j0vjfb}~%#kw6!;?SgO-W20AWy^)^5?QqHkeEz^k#jfDbf}?$
z+tT}f$eouOx(nOdA!ULd^Lq3#%ESzHhjOTONHrcQ3!mg_OUSH)-n#`*_JqSarf9-f
GeE188%V=c)

delta 215
zcmey))yXx%maRCsC_g7>qJ^1QtWH{KUUErhex636PLfWtPKr*dPTItEy^N`oZ5U;=
z(>0Pbt&?rjHIg;0Q-D;8rgbWiO4YPZ15#-~3aVWpeey&`UA+ujn1F_6b*6@<bruk3
z194emkwT(vUTV2Qie5@;T4HHViFM-SH!NNPwbqGxnR%Hdwi#eWnUfV+q&MGU<Y#2e
m0y32*^Du`qrcF*^RtJ*%nZ+hAVwM535*f3B^2w8ZShWFu*+d!u

diff --git a/theme/boost/amd/build/loader.min.js.map b/theme/boost/amd/build/loader.min.js.map
index bf9bf8dbcbd462291b396f7fad57619f9c0dcec3..2317b9bbfa35c0d744d4a5718976380562f3a0bc 100644
GIT binary patch
delta 933
zcmaJ=L2DC16eh9tki=R<5Q^Y*F(e^FA_|HXg_ljbjWO6ZX{@DMHk(PaxY=2Dwh<NS
zrFblcx%d~vlLYkO)w93Aljr^j-)yGUT)Kz1Z@%}<_h#OE^TGI){dhMMvLPFGS=hF_
zV*I_cz<j&wv2`Bs5etP(CAKxx=G=?iK*+tswPk9!z8e|T2$<h<{r&Zj4_(0!Sf2vp
zXw?jv;NFNCFQ_rJg8*s5STRHgZdHIj1@k;ZMHL!NkVi?HFehJ=UlIvZzMQ*>_Gs?g
zC9gtj03B)q*i2gUcMyL!U%b3pMaWvCCjOd@rrz;;K6}`v8vq+>Lyg|9z-nE&C}To>
zN^dl_6cpnY-2!Oh((F?UJtc>qvW_yALhGhtJyz@I^i2g|N4X;<Sp&LX0Sn%$1x78n
zZ|yu&zJtEiYn{2>SgAQx!Yirs16!kY0F~N;y38gY<t>PlH99Kr1Oqh$VmUPC7FHAK
zh)u3v+?<ogDSO!+20V<2ZU^aOgGkQdAuH>aNhejLf<*^Gh4V;6p&e+lIbhB!p|_My
z`MJsG%-#i=TKprM>FS}weGw6@rQ1&)5}&<3&6&?d101fsF6SaDd))4^a7B$xuJB;j
z-}MQ8=j6}-W0lKfQ;#V@P2$-?{>)sF$LXbHxh%&ESMQakdb86zD^ZIlo7kR5B0b9`
z`6GR!i1N_u5#fX!V*}goc{r<DF|TgaibMHAK_)Yw9OSoD-3WxPO$N*h@THJG56M|2
jNuSx#0X_h&qL?Lh_y3MGTf35eEivJ}JV`n7WO3;)r2;3M

delta 526
zcmYjOze~eV5GI;BSo~2zP(h7BQSnh6#6eMbNo%ZHELw#YMbq}Rq$Dpfi8_g!tI93z
zPU7HD@DFem9US}%9Q_MK#Cxe=Z@71N-*?}G`(7t5)T{Yri(8>eRG&G_DKS59mI7=U
zH%m6lxt@E%{Qp7Tb?wmd#2_g9u5Cj~TDeYdU*GLahD{8ivdcr$;>=g~iRzf1XYpE~
zE~v+OI;+8hG;r>uD5J!nG)sw2F+|RYWRM-4Vx?Dg(HD@FE=FZpl$Dk;5{UYyfLKET
zl+EZuhHFBHro=eH^fi*9G)H0vHE0%oV#{M`8d2Aa0@)zgt|GmHJETAzEvv(eM5IFF
zOS+fZJPp3(@wOukp4%V0>KfANu2472kdyo2RvwYk@FdUlu8L1HD1}dUJ#6mHX)qR>
zkhZ{x4L52Xn=<He1s*$1$oCz>TaT7#bzy3HagW1$?<n*o2B+|*L8vs3t}H2>ohsXr
z0})NZ_%mcTannP6%S;MmBk-(o89!);&+d;QVMx`o8Jc0cW`+4l$KuI)pq~8#DdVIh

diff --git a/theme/boost/amd/build/pending.min.js b/theme/boost/amd/build/pending.min.js
index d231b81d8f6fffe72e55d3abe063c3d217bb5d2e..3630be6a88f8a8d954987146ec7e23982277c974 100644
GIT binary patch
literal 2107
zcmbtV+m72d5Pi>A&}?Clh{E-zKoM9~7eSGS1-eMlZJu0rL6IX%TZvRD${Rz{zjvrh
z?4~V>Y+tOAHFIX>%uPd97$A)L94dH7t!?~O4MrE{K%*UnkF|Bap%H!jqXl=O`zULT
z@`W`_Mk()T+W=|2E0m}4`}7f%7kUK!$=Mp5KcOCdc!1{4>b3+Lbw^pYuw88i9?PIB
z+tMdTTWGS0)8q`#I|sgXhRF3=iZjHG+;+3sRt^J8dAt}AHAOWW=1lUwKaBtNJ<Lzd
z`0&X9Upk*V`$P;pkzY<VymQVvMsE$qi7`p<p{hOcmT164TZJ(JG1j~)JUE$_Knl}%
zX%vWG&8;EUX>dV5#V@l;G#W_f<cZjkrG`{(<4G=$KqT4SpQ_ZBV$}E6?HMN(_}pqi
zFQT1N=!%T3B%hLu@r8y0V8N2aV*)lK%SV!pImbuoh)U-2)XsVv6ot3<qoGi;ERieG
zl!XHJCVF+vN8HH*aT674pe!aD7_g43<S*~S$O=ZAJ6VqgeNXSfkK!CEc^mQ<nX?sB
zlY_VJ&{klu!-9{#zxs{cY(EtJEjJ#eH~sau{Wq^Uia(UHszLLc5#;MD;jtPBvtUn|
zo(ns@2dYe4mPwNKefqr=C76THd5Y0bVw_>MCw?}OPDb?5QtG=jRxe-jPVdw{k@z#r
zU8T=Xrq&8hXltgn*O<v%g{h`}zha+N7aN95)FSCi26K^idyHbWi6B{BN7*tL-krK7
z&;v&E86dVxl*cQk6P70jVc?@@oC|FY@HoKnPKmm0a+Zs6{6_ZE^;*p=Ap0p#9mwB@
zK}oN|<a8LqCe9K$;EuosIdvh5(0h8l4y3M<!;Vg*&^^D9!+^~us1AG@uxwZuRA&Z9
zN2oNlM$t_CBP%o6atO64l1`SmOt!lYCk>xemA1iUf}3iVH68YmlFs5nD$jb@(R$Gf
z@~CCYQq~QeweqtPiW&?ZqQz5_+o#!45b+aM2zQ%C`S}Qy)$$_DFAbo!wLOA+zJD*%
z|6y!pb5V;g4c=Q@`l5ce|KZ|pEQ=i1_`Ke5o45iRR&aq6^G;$fe^SDx4(+6qa3@}K
z95TJz;7P;B^*+x2)j%bbhV6%=!K4^lFrp%Da5*o31IM|&)WX*MyH3nDQMw#G&a_qI
z`V*<uCob@)s`Gv2-JNKCQHsarVLr)BbG(}Wg`xi$L)oe>!NUkLAkYvmL$*YO;4iMO
ez9NlnodVqCHJ+6ZKmVA_{zX+73`bP5e(@(x%i;n6

delta 222
zcmdljaF%U?f>c&vX=+iWQmjr|X<l+kW`3SVqGokjVv$19<`pdbO!fXrS*gh-dfBO!
z#TrSPdTIGZu8GMR8gSLgn$=0s$+4IcNf2XFY?JhgOA?Dpw3YOdiuIJVlXX&oLaBKv
zZ~^N?jg<W4(%jU%61}ASluAuKpes@!4w`(2T|lV-s5&z*T_aVqRuik@)XCS_<vBpo
KAUK(yLk9rqyG#)P

diff --git a/theme/boost/amd/build/pending.min.js.map b/theme/boost/amd/build/pending.min.js.map
index 74549e21fe5bd59c2d2d78fc044f851f81cb7290..09b04e7ca1750c7b23c94cf023a3d642989daef5 100644
GIT binary patch
delta 1429
zcma)6&rcIU6pr#UQniFCL=ZLv1$1bPF;PS?v%75tQfpHQ2qj_JPD|VEZo9ihDyhVy
zCna;?;Gduuy&4k_{tL!<GX4WzOiYXi-<z#aLNT4g+i%`{-<$Vl-p<~YpO;_W+*O|r
zG1IlP%o!%bY0D02`UapptAH(PS=-tDoFC21(XvcQStVB|WvWCeQ78<wSs85vjN<aW
z6KXpHm~i>`6KcmJfEn546DKPIUkCiAh8>_!v{X8fo>jpQSOa_m@I-5+Q^YNYV4>9`
z<-@ShR@ng(S){kZOJsr4C@7SioFGvTQ$-;$N*{omvURj+5~4J(=;$^S^jt$d&C5im
zbVC-djEn)61YQKFY^kESdE_f$)ZRy^lf(|xjn&dw&&*O~S?IjuSism(b)TT5$vi|R
z8JWTnVu5rMPfQJg2`!5taiIwxXi_BdPg9cd5UGutFtYDP43T+kp2R7Q<08~Ni=|+t
z4ip3*SKLZPp2PJgVp3AXf$?AMGk37`n9@vudj|muwE)$Qhwr|2d}z6pG_!@GWxG-?
zUS@VhO50XJ8qJk(GCGwsb<1>I{;_M|lx8s7y)CUIP5z^+pFj7X<*)pmeB5`A%f7y$
zDoL6Wj8*u0NY`wu>@dUAJoEPo{%hcW@||zQw+uroI;@^Qz~B4(_!qx#f4^_t0p8!;
z+d!YPtzyc0Y&NAIIGS(4N@<6ZJ$CcKqvE1fv^JUD)ZS+f%X!HksFio@jt$avEzPOj
zhj+HeiW{WsT9)Bvi%q3FRiADZdLn7EEzvV6me$IKD~*jy(=*bxckQwD9Mj#P_agBN
zJr{SzR^TZjl6Z+$>#5i;!W*o;T4Ok?i-iOnq6;Oq2|*LC2HiR>t&MCWIq2ZL8eDgR
zBipb|bqx~qM4r{HDd=EN8!}UMN@k}1qx1d;{-<ZCO_ayGPY3v9V7h&Op^v`^wAC%X
K4Mh0wz~EmMO|KmQ

delta 1522
zcmbVMOHUI~6i$WE2vboWJ^*3TG#2bljiN#{n%ud4fQUc}R4izw?JZ1OXU3UnwLw#N
z#+8!0ap}s$ozbO<zre(ezr&R~TzJk5Z2^rDW^v}b=bZ1n=FI(h?#=nv6H=ZRG@S=Y
zFcc(PSL=NxUbEp;Fs!(m+W-WLt?wmDsjW~-<|v&d6+nzI6bqEb5V=AnDN0kWWf7Gt
zAlSG<l9Wy}G4Jd5nWEr}b*P|Enc{;l=3fH1u9#xmS99?tz?(-rY%|aUMt3a+`nH-s
z4frzPZNMCGC2oqR?Ve95VTxbvwL1FHCkn{P1Wl1yEE$VsWSY`>gezH;_eh-5h?2vm
zE}%QDuzelmK+B4;0va{fg<)2&-J-`)Vi=(69wG`!)nNv4baH3FAt`epHz;6!AhBhd
zbO$z#kmbn?rMD5PSZo%Ntzg%&B#5}f@I@C;Boin-UKR)I^3uq=ixxv!Nx?fY2O@cq
zZFn`Kg&7KdEjNlcie*&0b!ZC1S$GW@$}KdQE_I!eB}&ucW5>-Y{ZPTCTEQk2FBtJJ
z9;H{3GibT<>AC+)TiRR0(M-7bsKTvUc#X(~ik@>cLmv%|$(yUX3{O?H<cCJSQs#@6
zs@ocxZTUvSj4o=KTh28(;}OKmu0i2Qz2behBtCcbi?3ZnB6RHd$QoJIJr^Y9RLiK?
zyxiiM(kb8sL|Ez*6Vd>3I$Ip^KswV5`wCpr0XOW9P8RP1gMUerw+u6HJl6N8k;Fe@
z>`wbFaPoiB4!0`B?o7ips@ytI)`7ht95s6&`tG8CbRVW@$1uu{W*#W(5EhLcKfB)e
zx^vkg&pA=J#KemeXY0+K0!4GHknzV>Wx!)Cx^oSVHhHG1S$l{`#<k>Ct~)75wH(+-
z^orW<AtHyPSvwk*BXWr+YET$58c&lM*Ygb?2e^l|pA-`Jdqz5&C5?&go?-E}XWWN|
T)7=ni*Uy92jBiXV_YVICuidjz

diff --git a/theme/boost/amd/src/loader.js b/theme/boost/amd/src/loader.js
index 6d5f9d84d25..b70eda4e279 100644
--- a/theme/boost/amd/src/loader.js
+++ b/theme/boost/amd/src/loader.js
@@ -26,38 +26,11 @@
 
 import $ from 'jquery';
 import Aria from './aria';
-import Scroll from './scroll';
 import Bootstrap from './bootstrap/index';
 import CustomEvents from 'core/custom_interaction_events';
-
-/**
- * Set up the search.
- *
- * @method init
- */
-export {
-    init,
-    Bootstrap
-};
-
-/**
- * Bootstrap init function
- */
-const init = () => {
-    rememberTabs();
-
-    enablePopovers();
-
-    enableTooltips();
-
-    const scroll = new Scroll();
-    scroll.init();
-
-    // Disables flipping the dropdowns up and getting hidden behind the navbar.
-    $.fn.dropdown.Constructor.Default.flip = false;
-
-    Aria.init();
-};
+import Pending from 'core/pending';
+import Scroll from './scroll';
+import setupBootstrapPendingChecks from './pending';
 
 /**
  * Rember the last visited tabs.
@@ -92,7 +65,6 @@ const enablePopovers = () => {
         CustomEvents.events.escape,
     ]);
     $('body').on(CustomEvents.events.escape, '[data-toggle=popover]', function() {
-
         $(this).trigger('blur');
     });
 };
@@ -106,4 +78,43 @@ const enableTooltips = () => {
         container: 'body',
         selector: '[data-toggle="tooltip"]'
     });
-};
\ No newline at end of file
+};
+
+/**
+ * Bootstrap init function
+ */
+const init = () => {
+    const pendingPromise = new Pending('theme_boost/loader:init');
+
+    setupBootstrapPendingChecks();
+
+    // Remember the last visited tabs.
+    rememberTabs();
+
+    // Enable all popovers.
+    enablePopovers();
+
+    // Enable all tooltips.
+    enableTooltips();
+
+    // Add scroll handling.
+    (new Scroll()).init();
+
+    // Disables flipping the dropdowns up and getting hidden behind the navbar.
+    $.fn.dropdown.Constructor.Default.flip = false;
+
+    // Setup Aria helpers for Bootstrap features.
+    Aria.init();
+
+    pendingPromise.resolve();
+};
+
+/**
+ * Set up the search.
+ *
+ * @method init
+ */
+export {
+    init,
+    Bootstrap
+};
diff --git a/theme/boost/amd/src/pending.js b/theme/boost/amd/src/pending.js
index 2e25c8126f4..4b3a5480fef 100644
--- a/theme/boost/amd/src/pending.js
+++ b/theme/boost/amd/src/pending.js
@@ -20,112 +20,114 @@
  * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-define(['jquery'], function($) {
-    var moduleTransitions = {
-        alert: [
-            // Alert.
-            {
-                start: 'close',
-                end: 'closed',
-            },
-        ],
 
-        carousel: [
-            {
-                start: 'slide',
-                end: 'slid',
-            },
-        ],
+import jQuery from 'jquery';
+const moduleTransitions = {
+    alert: [
+        // Alert.
+        {
+            start: 'close',
+            end: 'closed',
+        },
+    ],
 
-        collapse: [
-            {
-                start: 'hide',
-                end: 'hidden',
-            },
-            {
-                start: 'show',
-                end: 'shown',
-            },
-        ],
+    carousel: [
+        {
+            start: 'slide',
+            end: 'slid',
+        },
+    ],
 
-        dropdown: [
-            {
-                start: 'hide',
-                end: 'hidden',
-            },
-            {
-                start: 'show',
-                end: 'shown',
-            },
-        ],
+    collapse: [
+        {
+            start: 'hide',
+            end: 'hidden',
+        },
+        {
+            start: 'show',
+            end: 'shown',
+        },
+    ],
 
-        modal: [
-            {
-                start: 'hide',
-                end: 'hidden',
-            },
-            {
-                start: 'show',
-                end: 'shown',
-            },
-        ],
+    dropdown: [
+        {
+            start: 'hide',
+            end: 'hidden',
+        },
+        {
+            start: 'show',
+            end: 'shown',
+        },
+    ],
 
-        popover: [
-            {
-                start: 'hide',
-                end: 'hidden',
-            },
-            {
-                start: 'show',
-                end: 'shown',
-            },
-        ],
+    modal: [
+        {
+            start: 'hide',
+            end: 'hidden',
+        },
+        {
+            start: 'show',
+            end: 'shown',
+        },
+    ],
 
-        tab: [
-            {
-                start: 'hide',
-                end: 'hidden',
-            },
-            {
-                start: 'show',
-                end: 'shown',
-            },
-        ],
+    popover: [
+        {
+            start: 'hide',
+            end: 'hidden',
+        },
+        {
+            start: 'show',
+            end: 'shown',
+        },
+    ],
 
-        toast: [
-            {
-                start: 'hide',
-                end: 'hidden',
-            },
-            {
-                start: 'show',
-                end: 'shown',
-            },
-        ],
+    tab: [
+        {
+            start: 'hide',
+            end: 'hidden',
+        },
+        {
+            start: 'show',
+            end: 'shown',
+        },
+    ],
 
-        tooltip: [
-            {
-                start: 'hide',
-                end: 'hidden',
-            },
-            {
-                start: 'show',
-                end: 'shown',
-            },
-        ],
-    };
+    toast: [
+        {
+            start: 'hide',
+            end: 'hidden',
+        },
+        {
+            start: 'show',
+            end: 'shown',
+        },
+    ],
 
-    Object.keys(moduleTransitions).forEach(function(key) {
-        moduleTransitions[key].forEach(function(pair) {
-            var eventStart = pair.start + '.bs.' + key;
-            var eventEnd = pair.end + '.bs.' + key;
-            $(document.body).on(eventStart, function() {
+    tooltip: [
+        {
+            start: 'hide',
+            end: 'hidden',
+        },
+        {
+            start: 'show',
+            end: 'shown',
+        },
+    ],
+};
+
+export default () => {
+    Object.entries(moduleTransitions).forEach(([key, pairs]) => {
+        pairs.forEach(pair => {
+            const eventStart = `${pair.start}.bs.${key}`;
+            const eventEnd = `${pair.end}.bs.${key}`;
+            jQuery(document.body).on(eventStart, () => {
                 M.util.js_pending(eventEnd);
             });
 
-            $(document.body).on(eventEnd, function() {
+            jQuery(document.body).on(eventEnd, () => {
                 M.util.js_complete(eventEnd);
             });
         });
     });
-});
+};
-- 
2.17.1