Skip to content

Commit

Permalink
fix scrollView bug for 2d-tasks/issues/1555 (#4894)
Browse files Browse the repository at this point in the history
  • Loading branch information
knoxHuang authored and 2youyou2 committed Jul 17, 2019
1 parent db3d597 commit 4a7f79b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cocos2d/core/components/CCScrollView.js
Expand Up @@ -1230,7 +1230,7 @@ let ScrollView = cc.Class({
this._isScrollEndedWithThresholdEventFired = true;
}

if (this.elastic) {
if (this.elastic && !reachedEnd) {
let brakeOffsetPosition = newPosition.sub(this._autoScrollBrakingStartPosition);
if (isAutoScrollBrake) {
brakeOffsetPosition = brakeOffsetPosition.mul(brakingFactor);
Expand Down

0 comments on commit 4a7f79b

Please sign in to comment.