Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix scrollView bug for 2d-tasks/issues/1555 #4894

Merged
merged 1 commit into from Jul 17, 2019

Conversation

@knoxHuang
Copy link
Contributor

@knoxHuang knoxHuang commented Jul 17, 2019

Re: cocos-creator/2d-tasks#1555

Changes:

  • 当 scroll 到目标点以后,不应该在进行回弹的计算 new position
@zilongshanren
Copy link
Contributor

@zilongshanren zilongshanren commented Jul 17, 2019

LGTM, 多关注下正常情况下回弹的表现

@knoxHuang knoxHuang requested a review from 2youyou2 Jul 17, 2019
@2youyou2 2youyou2 merged commit 4a7f79b into cocos-creator:v2.1.3 Jul 17, 2019
1 check passed
jareguo added a commit that referenced this issue Jul 23, 2019
* commit '94e490299e0e5c860305ae3f0324a1bb5c222852':
  fixed api link error. (#4920)
  support alipay minigame (#4880)
  fixed api docs (#4918)
  add Edge browser type && fix webAudio bug on Edge and Baidu browser (#4910)
  remove warning when upgrading editBox compnent (#4916)
  refine code (#4900)
  fix scrollView bug for 2d-tasks/issues/1555 (#4894)

# Conflicts:
#	cocos2d/core/mesh/CCMesh.js
#	cocos2d/core/platform/CCSys.js
#	cocos2d/core/platform/CCView.js
#	cocos2d/videoplayer/video-player-impl.js
jareguo added a commit that referenced this issue Jul 23, 2019
* v2.2.0:
  fixed api link error. (#4920)
  support alipay minigame (#4880)
  fixed api docs (#4918)
  add Edge browser type && fix webAudio bug on Edge and Baidu browser (#4910)
  remove warning when upgrading editBox compnent (#4916)
  move platform related code (#4913)
  fix warn after subContextView modules are excluded (#4737)
  refine code (#4900)
  fix scrollView bug for 2d-tasks/issues/1555 (#4894)

# Conflicts:
#	cocos2d/core/mesh/CCMesh.js
#	cocos2d/core/platform/CCSys.js
#	cocos2d/core/utils/profiler/CCProfiler.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants