diff --git a/CHANGES.md b/CHANGES.md index 1598fe1917af298468194dd174c0c9ca6f2d7a1b..f0e893836612a2567d83f01fcb65b69e60d739b8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ Changes ### Unreleased +* 2019-10-28 - Adjusted columns2.mustache template due to upstream changes in theme Boost. * 2019-10-28 - Adjusted loginform.mustache template due to upstream changes in Moodle core. * 2019-10-28 - Adjusted function favicon() in core_renderer.php due to upstream changes in Moodle core. * 2019-10-28 - Removed CSS rule for maintenance warning due to upstream changes. diff --git a/templates/columns2.mustache b/templates/columns2.mustache index 5634d85020750a325d1c385a85f34794581c649e..81075923b032495e3523cda25b1a774dcfec208a 100644 --- a/templates/columns2.mustache +++ b/templates/columns2.mustache @@ -111,9 +111,14 @@ </body> </html> {{#js}} -require(['theme_boost/loader']); +M.util.js_pending('theme_boost/loader'); +require(['theme_boost/loader'], function() { + M.util.js_complete('theme_boost/loader'); +}); +M.util.js_pending('theme_boost/drawer'); require(['theme_boost/drawer'], function(mod) { mod.init(); + M.util.js_complete('theme_boost/drawer'); }); require(['theme_boost_campus/backtotop'], function(mod) { mod.init(); diff --git a/templates/columns2.mustache.original b/templates/columns2.mustache.original index d0425d39965068722cf0682dbaf932487e5e5de9..9953d8eadb82cb81564deaae973df94f4cdb48fa 100644 --- a/templates/columns2.mustache.original +++ b/templates/columns2.mustache.original @@ -95,8 +95,13 @@ </body> </html> {{#js}} -require(['theme_boost/loader']); +M.util.js_pending('theme_boost/loader'); +require(['theme_boost/loader'], function() { + M.util.js_complete('theme_boost/loader'); +}); +M.util.js_pending('theme_boost/drawer'); require(['theme_boost/drawer'], function(mod) { mod.init(); + M.util.js_complete('theme_boost/drawer'); }); {{/js}}