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

Working on virtual list viewport stuff

Browse Source
This commit is contained in:
Max Lynch
2013-10-28 15:47:59 -05:00
parent 789136219d
commit c85426e068
5 changed files with 174 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
js/views/scrollView.js
View File

@ -214,11 +214,7 @@
// Execute the scrollEnd event after 400ms the wheel stopped scrolling
clearTimeout(this.wheelTimeout);
this.wheelTimeout = setTimeout(function () {
ionic.trigger(this.scrollEndEventName, {
target: this.el,
scrollLeft: this.x,
scrollTop: this.y
});
that._doneScrolling();
}, 400);
e.preventDefault();
@ -303,18 +299,10 @@
// Triggered to end scroll, once the final animation has ended
if(needsWrapping && this._didEndScroll) {
this._didEndScroll = false;
ionic.trigger(this.scrollEndEventName, {
target: this.el,
scrollLeft: this.x,
scrollTop: this.y
});
this._doneScrolling();
} else if(!needsWrapping) {
this._didEndScroll = false;
ionic.trigger(this.scrollEndEventName, {
target: this.el,
scrollLeft: this.x,
scrollTop: this.y
});
this._doneScrolling();
}
this.el.style.webkitTransitionDuration = '0';
@ -557,7 +545,7 @@
newX = momentumX.destination;
newY = momentumY.destination;
// Calcualte the longest required time for the momentum animation and
// Calculate the longest required time for the momentum animation and
// use that.
time = Math.max(momentumX.duration, momentumY.duration);
}
@ -573,13 +561,22 @@
_this.scrollTo(newX, newY, time, easing);
} else {
// We are done
ionic.trigger(_this.scrollEndEventName, {
target: _this.el,
scrollLeft: _this.x,
scrollTop: _this.y
});
_this._doneScrolling();
}
});
},
_doneScrolling: function() {
this.didStopScrolling && this.didStopScrolling({
target: this.el,
scrollLeft: this.x,
scrollTop: this.y
});
ionic.trigger(this.scrollEndEventName, {
target: this.el,
scrollLeft: this.x,
scrollTop: this.y
});
}
}, {
DECEL_RATE_NORMAL: 0.998,