Fix draggable.momentum, less momentum tolerance

koenbok · Apr 7, 2015 · e6d5cda · e6d5cda
1 parent 64896a8
commit e6d5cda
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/framer/Defaults.coffee b/framer/Defaults.coffee
@@ -27,7 +27,7 @@ Originals =
 		momentum: true
 		momentumOptions:
 			friction: 2.1 
-			tolerance: 10 
+			tolerance: 1 
 		bounce: true
 		bounceOptions:
 			friction: 40

diff --git a/framer/LayerDraggable.coffee b/framer/LayerDraggable.coffee
@@ -467,8 +467,15 @@ class exports.LayerDraggable extends BaseClass
 
 	_startSimulation: ->
 
+		# The types of simulation that we can have are:
+		# 1) Momentum inside constraints
+		# 2) Momentum inside constraints to outside constraints bounce
+		# 3) Release outside constraints bounce
+		# 4) Momentum without constraints
+
 		return unless @momentum or @bounce
-		return if @isDragging is false and @isBeyondConstraints is false
+		return if @isBeyondConstraints is false and @momentum is false
+		return if @isBeyondConstraints is false and @isDragging is false
 
 		# If overdrag is disabled, we need to not have a bounce animation
 		# when the cursor is outside of the dragging bounds for an axis.