javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-24 23:01:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(scroll): fix js scrolling max and deceleration on touch start

Browse Source
This commit is contained in:
Adam Bradley
2016-12-09 22:29:12 -06:00
parent c510100ca1
commit 5bbbfb2b00
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/scroll-view.ts
View File

@ -194,7 +194,7 @@ export class ScrollView {
function setMax() {
if (!max) {
// ******** DOM READ ****************
max = (ele.scrollHeight - ele.offsetHeight) + contentTop + contentBottom;
max = ele.scrollHeight - ele.parentElement.offsetHeight + contentTop + contentBottom;
}
};
@ -208,6 +208,7 @@ export class ScrollView {
// update top with updated velocity
// clamp top within scroll limits
// ******** DOM READ ****************
setMax();
self._t = Math.min(Math.max(self._t + ev.velocityY, 0), max);
@ -242,6 +243,7 @@ export class ScrollView {
function jsScrollTouchStart(touchEvent: TouchEvent) {
positions.length = 0;
max = null;
self._dom.cancel(rafCancel);
positions.push(pointerCoord(touchEvent).y, touchEvent.timeStamp);
}