diff --git a/src/Module/OddThemeSetup.php b/src/Module/OddThemeSetup.php index 80be3da..9a6e060 100644 --- 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 index e8464bd..25fdb30 100644 --- 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(); ?>"> diff --git a/src/Resources/public/js/scripts.js b/src/Resources/public/js/scripts.js index 7055a04..5a13a1a 100644 --- 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 new file mode 100644 index 0000000..6db2062 --- /dev/null +++ b/src/Resources/public/js/scripts.min.js @@ -0,0 +1 @@ +jQuery.noConflict();jQuery(document).ready(function($){$(window).scroll(function(){scrollPos=$(document).scrollTop();$("footer .toplink").addClass("active");if(scrollPos<=500){$("footer .toplink").removeClass("active")}});$(document).on("click","footer .toplink",function(event){event.preventDefault();$("html, body").animate({scrollTop:0},1e3)});$("a[href*=\\#]").on("click",function(event){var href=$(this).attr("href");href=href.substr(0,href.indexOf("#"));href=href.replace("./","");var path=window.location.pathname;path=path.replace("/","");if($(this).attr("target")!="_blank"&&path==href){event.preventDefault();$("html,body").animate({scrollTop:$(this.hash).offset().top},1500)}});$("input").focus(function(){var element=$(this);if(element.offset().top-$(window).scrollTop()<115){$("html, body").animate({scrollTop:element.offset().top-130},500)}});var scrollPos=$(window).scrollTop();if(scrollPos>0){$(".nav-container").addClass("stuck")}else{$(".nav-container").removeClass("stuck")}var mobile=/Android|webOS|iPhone|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);if(mobile){var myElement=document.querySelector("#header .nav-container");var headroom=new Headroom(myElement,{offset:600});headroom.init()}$(window).scroll(function(){var scrollPos=$(window).scrollTop();if(scrollPos>0){$(".nav-container").addClass("stuck")}else{$(".nav-container").removeClass("stuck")}});$("#header .navbar ul li a").on("click",function(){$(".navbar .collapse.show").removeClass("show")});if($(".nav-container").hasClass("sloping")&&$("#header .headerImage").length==0){$("#container").addClass("sloping")}$(".dropdown-toggle").on("click",function(e){$(this).next("ul").toggle();e.stopPropagation();e.preventDefault()});if($("#header .nav-container").length>0&&$("html").html().indexOf("headroom.min.js")!==-1){var myElement=document.querySelector("#header .nav-container");var headroom=new Headroom(myElement,{offset:600});headroom.init()}$(".slider-control .slider-prev").html('');$(".slider-control .slider-next").html('')}); \ No newline at end of file