add option to disable headroom.js, add minfied scripts file

contao-themes-net · Jul 20, 2020 · 9d2f946 · 9d2f946
1 parent 940db10
commit 9d2f946
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/Module/OddThemeSetup.php b/src/Module/OddThemeSetup.php
@@ -4,7 +4,7 @@
 
 class OddThemeSetup extends \BackendModule
 {
-    const VERSION = '1.4.2';
+    const VERSION = '1.4.3';
 
     protected $strTemplate = 'be_oddtheme_setup';
 

diff --git a/src/Resources/contao/templates/layout/fe_bootstrap_odd.html5 b/src/Resources/contao/templates/layout/fe_bootstrap_odd.html5
@@ -66,7 +66,7 @@
     $combiner->add('bundles/pdirthemeodd/bootstrap/dist/js/bootstrap.min.js');
     $combiner->add('bundles/pdirthemeodd/fontawesome/js/all.min.js');
     $combiner->add('bundles/pdirthemeodd/js/headroom.min.js');
-    $combiner->add('bundles/pdirthemeodd/js/scripts.js');
+    $combiner->add('bundles/pdirthemeodd/js/scripts.min.js');
     echo $combiner->getCombinedFile();
     ?>"></script>
 

diff --git a/src/Resources/public/js/scripts.js b/src/Resources/public/js/scripts.js
@@ -90,14 +90,12 @@ jQuery.noConflict(); jQuery(document).ready(function($) {
         e.preventDefault();
     });
 
-    if( $("#header .nav-container").length > 0 ) {
+    if( $("#header .nav-container").length > 0 && $("html").html().indexOf("headroom.min.js") !== -1 ) {
         var myElement = document.querySelector("#header .nav-container");
-        if( !$("#header .nav-container").hasClass("disable-headroom") ) {
-            var headroom  = new Headroom(myElement, {
-                "offset": 600
-            });
-            headroom.init();
-        }
+        var headroom  = new Headroom(myElement, {
+            "offset": 600
+        });
+        headroom.init();
     }
 
     /* ===================== *

diff --git a/src/Resources/public/js/scripts.min.js b/src/Resources/public/js/scripts.min.js