Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge branch 'mattsjohnston-patch-1'
- Loading branch information
Showing
with
3 additions
and
1 deletion.
-
+3
−1
framer/Components/PageComponent.coffee
|
@@ -152,7 +152,9 @@ class exports.PageComponent extends ScrollComponent |
|
|
|
|
|
# See if we meet the minimum velocity to scroll to the next page. If not we snap |
|
|
# to the layer closest to the scroll point. |
|
|
if Math.max(Math.abs(velocity.x), Math.abs(velocity.y)) < @velocityThreshold |
|
|
if Math.max(Math.abs(velocity.x), Math.abs(velocity.y)) < @velocityThreshold or |
|
|
(@content.draggable._directionLockEnabledX and (@direction == 'right' or @direction == 'left')) or |
|
|
(@content.draggable._directionLockEnabledY and (@direction == 'down' or @direction == 'up')) |
|
|
# print "velocity" |
|
|
@snapToPage(@closestPage, true, @animationOptions) |
|
|
return |
|
|