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

Fixed interialEventInterval for scrolling, added biglist test

Browse Source
This commit is contained in:
Max Lynch
2013-10-28 10:34:07 -05:00
parent 6a8750e126
commit 9afb405b77
8 changed files with 2011 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
js/views/scrollView.js
View File

@ -38,7 +38,7 @@
resistance: 2,
scrollEventName: 'momentumScrolled',
scrollEndEventName: 'momentumScrollEnd',
intertialEventInterval: 50,
inertialEventInterval: 50,
mouseWheelSpeed: 20,
invertWheel: false,
isVerticalEnabled: true,
@ -47,7 +47,7 @@
bounceTime: 600 //how long to take when bouncing back in a rubber band
}, opts);
ionic.Utils.extend(this, opts);
ionic.extend(this, opts);
this.el = opts.el;
@ -111,6 +111,7 @@
el.style.webkitTransitionDuration = time;
el.style.webkitTransform = 'translate3d(' + x + 'px,' + y + 'px, 0)';
clearTimeout(this._momentumStepTimeout);
// Start triggering events as the element scrolls from inertia.
// This is important because we need to receive scroll events
// even after a "flick" and adjust, etc.
@ -136,6 +137,28 @@
}, this.inertialEventInterval)
},
needsWrapping: function() {
var _this = this;
var totalWidth = this.el.scrollWidth;
var totalHeight = this.el.scrollHeight;
var parentWidth = this.el.parentNode.offsetWidth;
var parentHeight = this.el.parentNode.offsetHeight;
var maxX = Math.min(0, (-totalWidth + parentWidth));
var maxY = Math.min(0, (-totalHeight + parentHeight));
if (this.isHorizontalEnabled && (this.x > 0 || this.x < maxX)) {
return true;
}
if (this.isVerticalEnabled && (this.y > 0 || this.y < maxY)) {
return true;
}
return false;
},
/**
* If the scroll position is outside the current bounds,
* animate it back.
@ -275,13 +298,22 @@
return;
}
var needsWrapping = this.needsWrapping();
// Triggered to end scroll, once the final animation has ended
if(this._didEndScroll) {
if(needsWrapping && this._didEndScroll) {
this._didEndScroll = false;
ionic.trigger(_this.scrollEndEventName, {
target: _this.el,
scrollLeft: _this.x,
scrollTop: _this.y
ionic.trigger(this.scrollEndEventName, {
target: this.el,
scrollLeft: this.x,
scrollTop: this.y
});
} else if(!needsWrapping) {
this._didEndScroll = false;
ionic.trigger(this.scrollEndEventName, {
target: this.el,
scrollLeft: this.x,
scrollTop: this.y
});
}