Smart menu JS included to the page based on menus existence.

- Fix moodle-an-hochschulen#357, UN-231
bdecentgmbh · Sep 16, 2023 · 5112546 · 5112546
1 parent c41310c
commit 5112546
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/classes/output/navigation/primary.php b/classes/output/navigation/primary.php
@@ -136,13 +136,17 @@ public function export_for_template(?renderer_base $output = null): array {
         $usermenu = $this->get_user_menu($output);
         $this->build_usermenus($usermenu, $locationusermenus);
 
+        // Verify any of the smartmenus are going to include in the page.
+        $includesmartmenus = (!empty($mainmenu) || !empty($menubarmenus) || !empty($locationusermenus) || !empty($locationbottom));
+
         return [
             'mobileprimarynav' => $mobileprimarynav,
             'moremenu' => $moremenu->export_for_template($output),
             'menubar' => isset($menubarmoremenu) ? $menubarmoremenu->export_for_template($output) : false,
             'lang' => !isloggedin() || isguestuser() ? $languagemenu->export_for_template($output) : [],
             'user' => $usermenu ?? [],
-            'bottombar' => $bottombardata ?? false
+            'bottombar' => $bottombardata ?? false,
+            'includesmartmenu' => $includesmartmenus ? true : false
         ];
     }
 

diff --git a/layout/includes/smartmenus.php b/layout/includes/smartmenus.php
@@ -27,3 +27,6 @@
 // Add smart menu elements to template context.
 $templatecontext['menubar'] = $primarymenu['menubar'] ?? [];
 $templatecontext['bottombar'] = $primarymenu['bottombar'] ?? [];
+// Verify the smart menu contains any menus to show.
+$smartmenuincluded = (isset($primarymenu['includesmartmenu']) && !empty($primarymenu['includesmartmenu']));
+$templatecontext['includesmartmenu'] = $smartmenuincluded ? true : false;
diff --git a/templates/theme_boost/columns2.mustache b/templates/theme_boost/columns2.mustache
@@ -122,9 +122,9 @@
 </html>
 {{#js}}
 M.util.js_pending('theme_boost/loader');
-require(['theme_boost/loader', 'theme_boost/drawer', 'theme_boost_union/smartmenu'], function(Loader, Drawer, SmartMenu) {
+require(['theme_boost/loader', 'theme_boost/drawer'{{#includesmartmenu}}, 'theme_boost_union/smartmenu'{{/includesmartmenu}}], function(Loader, Drawer{{#includesmartmenu}}, SmartMenu{{/includesmartmenu}}) {
     Drawer.init();
     M.util.js_complete('theme_boost/loader');
-    SmartMenu.init();
+    {{#includesmartmenu}} SmartMenu.init(); {{/includesmartmenu}}
 });
 {{/js}}
diff --git a/templates/theme_boost/drawers.mustache b/templates/theme_boost/drawers.mustache
@@ -297,10 +297,10 @@
 </html>
 {{#js}}
 M.util.js_pending('theme_boost/loader');
-require(['theme_boost/loader', 'theme_boost/drawer'{{#regions.offcanvas.hasblocks}},'theme_boost_union/offcanvas'{{/regions.offcanvas.hasblocks}}, 'theme_boost_union/smartmenu'], function(Loader, Drawer{{#regions.offcanvas.hasblocks}},OffCanvas{{/regions.offcanvas.hasblocks}}, SmartMenu) {
+require(['theme_boost/loader', 'theme_boost/drawer'{{#regions.offcanvas.hasblocks}},'theme_boost_union/offcanvas'{{/regions.offcanvas.hasblocks}}{{#includesmartmenu}}, 'theme_boost_union/smartmenu'{{/includesmartmenu}}], function(Loader, Drawer{{#regions.offcanvas.hasblocks}},OffCanvas{{/regions.offcanvas.hasblocks}}{{#includesmartmenu}}, SmartMenu{{/includesmartmenu}}) {
     Drawer.init();
     M.util.js_complete('theme_boost/loader');
     {{#regions.offcanvas.hasblocks}}OffCanvas.init();{{/regions.offcanvas.hasblocks}}
-    SmartMenu.init();
+    {{#includesmartmenu}} SmartMenu.init(); {{/includesmartmenu}}
 });
 {{/js}}