From c6197210d82a1fb3226d0f01bedd325086beae3a Mon Sep 17 00:00:00 2001 From: Joe Germuska Date: Wed, 25 Mar 2015 10:05:29 -0500 Subject: [PATCH] Revert "Use the slow jQuery path to animate scrollTop" This reverts commit 5f71cf63ce018bc1631a2946c67f1edb0e89fe35. --- source/js/Core/Core/VMM.Library.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source/js/Core/Core/VMM.Library.js b/source/js/Core/Core/VMM.Library.js index b40aecd..6de96b3 100644 --- a/source/js/Core/Core/VMM.Library.js +++ b/source/js/Core/Core/VMM.Library.js @@ -421,10 +421,9 @@ if(typeof VMM != 'undefined') { jQuery(element).stop(); } }, - - // TODO: Consider removing this as it's referenced by one commented line + delay_animate: function(delay, element, duration, ease, att, callback_function) { - if (VMM.Browser.features.css.transitions && !('scrollTop' in _att)) { + if (VMM.Browser.features.css.transitions) { var _tdd = Math.round((duration/1500)*10)/10, __duration = _tdd + 's'; @@ -473,7 +472,9 @@ if(typeof VMM != 'undefined') { _att = {opacity: 0} } - if (VMM.Browser.features.css.transitions && !('scrollTop' in _att)) { + + if (VMM.Browser.features.css.transitions) { + var _tdd = Math.round((_duration/1500)*10)/10, __duration = _tdd + 's';