From 4f12a23a7c3834c0d0f94ceb6ccbcbd1d9d73147 Mon Sep 17 00:00:00 2001 From: Nikita Date: Thu, 5 Mar 2015 18:06:36 +0300 Subject: [PATCH 1/2] Slimscroll disabling page scroll Issue#158 Small fix created by antoinedc By antoinedc I also got the issue when the scrollbar of my page is completely disabled by Slimscroll, when combined with another plugin. (c) --- jquery.slimscroll.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jquery.slimscroll.js b/jquery.slimscroll.js index 190368e..5213fb8 100644 --- a/jquery.slimscroll.js +++ b/jquery.slimscroll.js @@ -314,7 +314,7 @@ function _onWheel(e) { // use mouse wheel only when mouse is over - if (!isOverPanel) { return; } + if (!isOverPanel || me.css('display') === '') { return; } var e = e || window.event; From 47dc6feee974f8fcc2e024c9e0e848133591e3aa Mon Sep 17 00:00:00 2001 From: Nikita Date: Thu, 26 Mar 2015 16:09:38 +0300 Subject: [PATCH 2/2] Small code improvement Apply @truongthinnguyen improvement. Also fix firefox issue. --- jquery.slimscroll.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jquery.slimscroll.js b/jquery.slimscroll.js index 5213fb8..d04a3a7 100644 --- a/jquery.slimscroll.js +++ b/jquery.slimscroll.js @@ -314,7 +314,7 @@ function _onWheel(e) { // use mouse wheel only when mouse is over - if (!isOverPanel || me.css('display') === '') { return; } + if (!isOverPanel || !me.is(':visible')) { return; } var e = e || window.event;