File tree Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -2028,8 +2028,9 @@ ionic.views.Scroll = ionic.views.View.inherit({
2028
2028
if ( isHeadingOutwardsX ) {
2029
2029
self . __decelerationVelocityX += scrollOutsideX * penetrationDeceleration ;
2030
2030
}
2031
+ var isStoppedX = Math . abs ( self . __decelerationVelocityX ) <= self . __minDecelerationScrollLeft ;
2031
2032
//If we're not heading outwards, or if the above statement got us below minDeceleration, go back towards bounds
2032
- if ( ! isHeadingOutwardsX || self . __decelerationVelocityX <= self . __minDecelerationScrollLeft ) {
2033
+ if ( ! isHeadingOutwardsX || isStoppedX ) {
2033
2034
self . __decelerationVelocityX = scrollOutsideX * penetrationAcceleration ;
2034
2035
}
2035
2036
}
@@ -2039,8 +2040,9 @@ ionic.views.Scroll = ionic.views.View.inherit({
2039
2040
if ( isHeadingOutwardsY ) {
2040
2041
self . __decelerationVelocityY += scrollOutsideY * penetrationDeceleration ;
2041
2042
}
2043
+ var isStoppedY = Math . abs ( self . __decelerationVelocityY ) <= self . __minDecelerationScrollTop ;
2042
2044
//If we're not heading outwards, or if the above statement got us below minDeceleration, go back towards bounds
2043
- if ( ! isHeadingOutwardsY || self . __decelerationVelocityY <= self . __minDecelerationScrollTop ) {
2045
+ if ( ! isHeadingOutwardsY || isStoppedY ) {
2044
2046
self . __decelerationVelocityY = scrollOutsideY * penetrationAcceleration ;
2045
2047
}
2046
2048
}
You can’t perform that action at this time.
0 commit comments