Skip to content

Commit

Permalink
Merge pull request #315 from koenbok/fix-touchevent
Browse files Browse the repository at this point in the history
Fix animationStop behaviour in draggable
  • Loading branch information
koenbok committed Feb 17, 2016
2 parents 195bc4d + d86aa06 commit b7039f5
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion framer/LayerDraggable.coffee
Expand Up @@ -132,7 +132,10 @@ class exports.LayerDraggable extends BaseClass
# so we can use it to detect a click versus a drag. # so we can use it to detect a click versus a drag.
@_isMoving = @isAnimating @_isMoving = @isAnimating


@layer.animateStop() for animation in @layer.animations()
if animation.options.properties.hasOwnProperty('x') or animation.options.properties.hasOwnProperty('y')
animation.stop()

@_stopSimulation() @_stopSimulation()
@_resetdirectionLock() @_resetdirectionLock()


Expand Down

0 comments on commit b7039f5

Please sign in to comment.