Merge pull request #315 from koenbok/fix-touchevent

Fix animationStop behaviour in draggable
koenbok · Feb 17, 2016 · b7039f52f21f0ec685707b423517452f7962f81a · b7039f5
2 parents 195bc4d + d86aa06
commit b7039f52f21f0ec685707b423517452f7962f81a
Unified Split

Showing with 4 additions and 1 deletion.

+4 −1 framer/LayerDraggable.coffee
diff --git 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.hasOwnProperty('x') or animation.options.properties.hasOwnProperty('y')
+				animation.stop()
+
 		@_stopSimulation()
 		@_resetdirectionLock()