diff --git a/src/definitions/modules/sidebar.js b/src/definitions/modules/sidebar.js index b2e36f6c4..371e9c90d 100755 --- a/src/definitions/modules/sidebar.js +++ b/src/definitions/modules/sidebar.js @@ -111,7 +111,6 @@ $.fn.sidebar = function(parameters) { bind: { clickaway: function() { $context - .on('scroll' + eventNamespace, module.event.preventScroll) .on('click' + eventNamespace, module.event.clickaway) .on('touchend' + eventNamespace, module.event.clickaway) ; @@ -137,6 +136,7 @@ $.fn.sidebar = function(parameters) { convert: { toAbsolute: function() { + window.scrollTo(0, 0); /* var scrollTop = $(document).scrollTop() ; @@ -152,6 +152,7 @@ $.fn.sidebar = function(parameters) { ;*/ }, toFixed: function() { + window.scrollTo(0, 0); /* $fixed .css({ transform: 'translate3d(0, 0px, 0px)' @@ -686,8 +687,8 @@ $.fn.sidebar.settings = { verbose : false, performance : false, - animation : 'safe', - mobileAnimation : 'safe', + animation : 'scale down', + mobileAnimation : 'slide along', context : 'body', useCSS : true, diff --git a/src/definitions/modules/sidebar.less b/src/definitions/modules/sidebar.less index 55e0dbd13..ad98b6f47 100755 --- a/src/definitions/modules/sidebar.less +++ b/src/definitions/modules/sidebar.less @@ -41,7 +41,6 @@ will-change: transform; overflow-y: auto !important; - -webkit-overflow-scrolling: touch; } /*-------------- @@ -115,6 +114,10 @@ opacity: 1 !important; } +.pushable.pushed > .visible.sidebar { + -webkit-overflow-scrolling: touch; +} + /*.pushable.hide > .pusher > .page *, .pushable.show > .pusher > .page *, .pushable.pushed > .pusher > .page * {