From 5bab0d4321c2f8d2ae05b4ab02054a3d40e14a78 Mon Sep 17 00:00:00 2001 From: Floris Verloop Date: Wed, 17 Feb 2016 15:42:37 +0100 Subject: [PATCH 1/2] Only animations with x/y props are stopped in draggable --- framer/LayerDraggable.coffee | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/framer/LayerDraggable.coffee b/framer/LayerDraggable.coffee index 494fb8699..6edd5a19f 100644 --- a/framer/LayerDraggable.coffee +++ b/framer/LayerDraggable.coffee @@ -132,7 +132,10 @@ class exports.LayerDraggable extends BaseClass # so we can use it to detect a click versus a drag. @_isMoving = @isAnimating - @layer.animateStop() + for animation in @layer.animations() + if animation.options.properties.x or animation.options.properties.y + @layer.animateStop() + @_stopSimulation() @_resetdirectionLock() From d86aa060126b52dafa20c86d037f9b64cc703d1b Mon Sep 17 00:00:00 2001 From: Floris Verloop Date: Wed, 17 Feb 2016 16:31:38 +0100 Subject: [PATCH 2/2] Only animations with x/y props are stopped --- framer/LayerDraggable.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framer/LayerDraggable.coffee b/framer/LayerDraggable.coffee index 6edd5a19f..67315b4bc 100644 --- a/framer/LayerDraggable.coffee +++ b/framer/LayerDraggable.coffee @@ -133,8 +133,8 @@ class exports.LayerDraggable extends BaseClass @_isMoving = @isAnimating for animation in @layer.animations() - if animation.options.properties.x or animation.options.properties.y - @layer.animateStop() + if animation.options.properties.hasOwnProperty('x') or animation.options.properties.hasOwnProperty('y') + animation.stop() @_stopSimulation() @_resetdirectionLock()