From 2b1135da9670613549f03d0f8a9110ab40d8b972 Mon Sep 17 00:00:00 2001
From: Kathrin Osswald <kathrin.osswald@uni-ulm.de>
Date: Mon, 28 Oct 2019 15:09:44 +0100
Subject: [PATCH] Adjusted columns2.mustache template due to upstream changes
in theme Boost.
---
CHANGES.md | 1 +
templates/columns2.mustache | 7 ++++++-
templates/columns2.mustache.original | 7 ++++++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 1598fe1..f0e8938 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 5634d85..8107592 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 d0425d3..9953d8e 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}}
--
GitLab