From 07c7a08e823561e45958e0a97ddfb718cae686da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2EJ=2E=20Garc=C3=ADa?= Date: Thu, 30 Mar 2017 23:38:08 +0200 Subject: [PATCH] Solve #78 issue, correct order axis movement defined en queued option --- dist/jquery.ascensor.js | 4 ++-- src/jquery.ascensor.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/jquery.ascensor.js b/dist/jquery.ascensor.js index a03592c..c7e148c 100644 --- a/dist/jquery.ascensor.js +++ b/dist/jquery.ascensor.js @@ -668,7 +668,7 @@ author: Léo Galley // => Set scrollLeft property // => Set callback to a second animation (scrollTop) // => return animationSettings - else { + else if (self.options.queued === 'x') { animationSettings.property.scrollLeft = scrollLeftValue; secondAnimationSettings.property.scrollTop = scrollTopValue; animationSettings.callback = function() { @@ -690,7 +690,7 @@ author: Léo Galley // => Set scrollTop property // => Set callback to a second animation (scrollLeft) // => return animationSettings - else { + else if (self.options.queued === 'y') { animationSettings.property.scrollTop = scrollTopValue; secondAnimationSettings.property.scrollLeft = scrollLeftValue; animationSettings.callback = function() { diff --git a/src/jquery.ascensor.js b/src/jquery.ascensor.js index ffe66bc..5f81ea1 100644 --- a/src/jquery.ascensor.js +++ b/src/jquery.ascensor.js @@ -660,7 +660,7 @@ // => Set scrollLeft property // => Set callback to a second animation (scrollTop) // => return animationSettings - else { + else if (self.options.queued === 'x') { animationSettings.property.scrollLeft = scrollLeftValue; secondAnimationSettings.property.scrollTop = scrollTopValue; animationSettings.callback = function() { @@ -682,7 +682,7 @@ // => Set scrollTop property // => Set callback to a second animation (scrollLeft) // => return animationSettings - else { + else if (self.options.queued === 'y') { animationSettings.property.scrollTop = scrollTopValue; secondAnimationSettings.property.scrollLeft = scrollLeftValue; animationSettings.callback = function() {