diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index b9dc90ae..a9d6e6a9 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -2122,4 +2122,4 @@ animation: animate-bg2 2.0s 1.9s ease-in infinite; .loop-count .remote {display:none !important;} .loop-count .remote.remote-main {display:inline-block !important;} -.scrollhidden {overflow:hidden;} +.scrollhidden {overflow:hidden;height:100%;position:fixed;} diff --git a/src/main/webapp/js/default.js b/src/main/webapp/js/default.js index 73be21bb..54c936a8 100644 --- a/src/main/webapp/js/default.js +++ b/src/main/webapp/js/default.js @@ -380,21 +380,20 @@ $(document).ready(function(){ if (settings.animation.effect == "fade") { menu.fadeIn(settings.animation.show); $(".BG").fadeIn("fast"); - $("html, body").addClass("scrollhidden"); $("html, body").addClass('scrollhidden').on('scroll touchmove mousewheel', function (e) { e.preventDefault(); + e.stopPropagation(); }); } else if (settings.animation.effect == "slide") { menu.slideDown(settings.animation.show); $(".BG").fadeIn("fast"); - $("html, body").addClass("scrollhidden"); $("html, body").addClass('scrollhidden').on('scroll touchmove mousewheel', function (e) { e.preventDefault(); + e.stopPropagation(); }); } else { menu.show(); menu.removeClass("hide"); - $("html, body").removeClass("scrollhidden"); $("html, body").removeClass('scrollhidden').off('scroll touchmove mousewheel'); } } @@ -409,7 +408,6 @@ $(document).ready(function(){ menu.removeAttr("style"); button.removeClass(settings.selected); $(".BG").fadeOut("fast"); - $("html, body").removeClass("scrollhidden"); $("html, body").removeClass('scrollhidden').off('scroll touchmove mousewheel'); }); } else if (settings.animation.effect == "slide") { @@ -417,7 +415,6 @@ $(document).ready(function(){ menu.removeAttr("style"); button.removeClass(settings.selected); $(".BG").fadeOut("fast"); - $("html, body").removeClass("scrollhidden"); $("html, body").removeClass('scrollhidden').off('scroll touchmove mousewheel'); }); } else {