From 0500a246f75071173ff006750ad9354124d56a05 Mon Sep 17 00:00:00 2001 From: jlukic Date: Tue, 30 Sep 2014 16:04:14 -0400 Subject: [PATCH] Fixes mobile return scroll, adds as default behavior --- src/definitions/modules/sidebar.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/definitions/modules/sidebar.js b/src/definitions/modules/sidebar.js index c72e7ed17..ae8c07cae 100755 --- a/src/definitions/modules/sidebar.js +++ b/src/definitions/modules/sidebar.js @@ -313,7 +313,7 @@ $.fn.sidebar = function(parameters) { requestAnimationFrame(animate); } else { - if(module.is.mobile()) { + if(settings.transition == 'scale down' || module.is.mobile()) { $module.scrollTop(0); currentScroll = $(window).scrollTop(); window.scrollTo(0, 0); @@ -347,8 +347,12 @@ $.fn.sidebar = function(parameters) { module.remove.direction(); module.remove.outward(); module.remove.visible(); - if(module.is.mobile() && settings.returnScroll) { - window.scrollTo(0, currentScroll); + if(transition == 'scale down' || (module.is.mobile() && settings.returnScroll) ) { + $page + .animate({ + scrollTop: currentScroll + }, 500) + ; } $.proxy(callback, element)(); }