MDL-68833 theme_boost: prevent having to call init on the loader

This was added in a previous master-only issue and breaks backwards compatability with child themes.

There is no need to have the init function here.

diff --git a/theme/boost/amd/build/loader.min.js b/theme/boost/amd/build/loader.min.js
index 8d040cd..baacba5 100644 (file)
Binary files a/theme/boost/amd/build/loader.min.js and b/theme/boost/amd/build/loader.min.js differ

diff --git a/theme/boost/amd/build/loader.min.js.map b/theme/boost/amd/build/loader.min.js.map
index 9549e86..bcde39c 100644 (file)
Binary files a/theme/boost/amd/build/loader.min.js.map and b/theme/boost/amd/build/loader.min.js.map differ

diff --git a/theme/boost/amd/src/loader.js b/theme/boost/amd/src/loader.js
index 5d1d08d..a050c6f 100644 (file)
--- a/theme/boost/amd/src/loader.js
+++ b/theme/boost/amd/src/loader.js
@@ -78,41 +78,31 @@ const enableTooltips = () => {
     });
 };
 
-/**
- * Bootstrap init function
- */
-const init = () => {
-    const pendingPromise = new Pending('theme_boost/loader:init');
+const pendingPromise = new Pending('theme_boost/loader:init');
 
-    setupBootstrapPendingChecks();
+// Add pending promise event listeners to relevant Bootstrap custom events.
+setupBootstrapPendingChecks();
 
-    // Remember the last visited tabs.
-    rememberTabs();
+// Remember the last visited tabs.
+rememberTabs();
 
-    // Enable all popovers.
-    enablePopovers();
+// Enable all popovers.
+enablePopovers();
 
-    // Enable all tooltips.
-    enableTooltips();
+// Enable all tooltips.
+enableTooltips();
 
-    // Add scroll handling.
-    (new Scroll()).init();
+// Add scroll handling.
+(new Scroll()).init();
 
-    // Disables flipping the dropdowns up and getting hidden behind the navbar.
-    $.fn.dropdown.Constructor.Default.flip = false;
+// 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();
+// Setup Aria helpers for Bootstrap features.
+Aria.init();
 
-    pendingPromise.resolve();
-};
+pendingPromise.resolve();
 
-/**
- * Set up the search.
- *
- * @method init
- */
 export {
-    init,
-    Bootstrap
+    Bootstrap,
 };

diff --git a/theme/boost/templates/columns1.mustache b/theme/boost/templates/columns1.mustache
index 08a0a12..c5810dc 100644 (file)
--- a/theme/boost/templates/columns1.mustache
+++ b/theme/boost/templates/columns1.mustache
@@ -65,7 +65,6 @@
 </body>
 </html>
 M.util.js_pending('theme_boost/loader');
-require(['theme_boost/loader'], function(loader) {
-    loader.init();
+require(['theme_boost/loader'], function() {
     M.util.js_complete('theme_boost/loader');
 });

diff --git a/theme/boost/templates/columns2.mustache b/theme/boost/templates/columns2.mustache
index fcb9b2c..5feab1c 100644 (file)
--- a/theme/boost/templates/columns2.mustache
+++ b/theme/boost/templates/columns2.mustache
@@ -97,8 +97,7 @@
 </html>
 {{#js}}
 M.util.js_pending('theme_boost/loader');
-require(['theme_boost/loader'], function(loader) {
-    loader.init();
+require(['theme_boost/loader'], function() {
     M.util.js_complete('theme_boost/loader');
 });
 

diff --git a/theme/boost/templates/secure.mustache b/theme/boost/templates/secure.mustache
index 9d8b289..21f48b6 100644 (file)
--- a/theme/boost/templates/secure.mustache
+++ b/theme/boost/templates/secure.mustache
@@ -88,7 +88,6 @@
 </body>
 </html>
 M.util.js_pending('theme_boost/loader');
-require(['theme_boost/loader'], function(loader) {
-    loader.init();
+require(['theme_boost/loader'], function() {
     M.util.js_complete('theme_boost/loader');
 });

diff --git a/theme/classic/templates/columns.mustache b/theme/classic/templates/columns.mustache
index 1ae3fc6..787b41f 100644 (file)
--- a/theme/classic/templates/columns.mustache
+++ b/theme/classic/templates/columns.mustache
@@ -97,8 +97,7 @@
 </html>
 {{#js}}
 M.util.js_pending('theme_boost/loader');
-require(['theme_boost/loader'], function(loader) {
-    loader.init();
+require(['theme_boost/loader'], function() {
     M.util.js_complete('theme_boost/loader');
 });
 {{/js}}

diff --git a/theme/classic/templates/contentonly.mustache b/theme/classic/templates/contentonly.mustache
index 4d8ca86..cb5d9c2 100644 (file)
--- a/theme/classic/templates/contentonly.mustache
+++ b/theme/classic/templates/contentonly.mustache
@@ -69,8 +69,7 @@
 </html>
 {{#js}}
 M.util.js_pending('theme_boost/loader');
-require(['theme_boost/loader'], function(loader) {
-    loader.init();
+require(['theme_boost/loader'], function() {
     M.util.js_complete('theme_boost/loader');
 });
 {{/js}}

diff --git a/theme/classic/templates/secure.mustache b/theme/classic/templates/secure.mustache
index 1d06183..b237592 100644 (file)
--- a/theme/classic/templates/secure.mustache
+++ b/theme/classic/templates/secure.mustache
@@ -107,8 +107,7 @@
 </html>
 {{#js}}
 M.util.js_pending('theme_boost/loader');
-require(['theme_boost/loader'], function(loader) {
-    loader.init();
+require(['theme_boost/loader'], function() {
     M.util.js_complete('theme_boost/loader');
 });
 {{/js}}