From a2af3587c39ac5909f8b9da8a2d974c9d88c9727 Mon Sep 17 00:00:00 2001 From: k-one-o-two Date: Thu, 17 Nov 2016 12:40:04 +0300 Subject: [PATCH 1/2] Update jquery.scrollbar.js --- jquery.scrollbar.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jquery.scrollbar.js b/jquery.scrollbar.js index 0883fd3..6366442 100644 --- a/jquery.scrollbar.js +++ b/jquery.scrollbar.js @@ -197,6 +197,14 @@ c.on('scroll' + namespace, function (event) { var scrollLeft = c.scrollLeft(); var scrollTop = c.scrollTop(); + + // in case of hidden overflow: + // IE should not include margin (added for the native scrollbar, which is hidden) in scrollTop + if ((browser.msedge || browser.msie) && c.css('overflow-x') === 'hidden') { + var marginBottom = parseInt(c.css('margin-bottom')); + scrollTop = scrollTop - marginBottom; + } + if (o.isRtl) { // webkit 0:100 // ie/edge 100:0 From f87571ec269b079e6e17924fad4e4af11d4c9ca0 Mon Sep 17 00:00:00 2001 From: k-one-o-two Date: Wed, 23 Nov 2016 15:25:00 +0300 Subject: [PATCH 2/2] Update jquery.scrollbar.js --- jquery.scrollbar.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/jquery.scrollbar.js b/jquery.scrollbar.js index 6366442..e1afe36 100644 --- a/jquery.scrollbar.js +++ b/jquery.scrollbar.js @@ -196,14 +196,7 @@ c.on('scroll' + namespace, function (event) { var scrollLeft = c.scrollLeft(); - var scrollTop = c.scrollTop(); - - // in case of hidden overflow: - // IE should not include margin (added for the native scrollbar, which is hidden) in scrollTop - if ((browser.msedge || browser.msie) && c.css('overflow-x') === 'hidden') { - var marginBottom = parseInt(c.css('margin-bottom')); - scrollTop = scrollTop - marginBottom; - } + var scrollTop = c.scrollTop(); if (o.isRtl) { // webkit 0:100 @@ -626,10 +619,17 @@ "max-height": "none" }); } else { + if ((browser.msedge || browser.msie) && container.css('overflow-x') === 'hidden') { + // do not add scroll.height if it is hidden + containerWrapper.css({ + "max-height": AreaVisible + 'px' + }); + } else { containerWrapper.css({ - //"height": "auto", // do not reset height value: issue with height:100%! - "max-height": (AreaVisible + browser.scroll.height) + 'px' + //"height": "auto", // do not reset height value: issue with height:100%! + "max-height": (AreaVisible + browser.scroll.height) + 'px' }); + } } }