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

Slide box velocity fix both directions

Browse Source
This commit is contained in:
Max Lynch
2013-10-16 08:24:31 -05:00
parent b3cd02b5c9
commit 77d9ef53d1
5 changed files with 85 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dist/js/ionic.js vendored
View File

@ -2302,6 +2302,16 @@ window.ionic = {
};
ionic.views.SlideBox.prototype = {
/**
* Tell the pager to update itself if content is added or
* removed.
*/
update: function() {
this._updatePager();
},
prependSlide: function(el) {
},
/**
* Slide to the given slide index.
@ -2406,16 +2416,15 @@ window.ionic = {
// TODO: Do we need this anymore?
finalOffsetX = 0;
} else if(ratio >= -0.5) {
// We are more than half-way through a drag
// We are less than half-way through a drag
// Sliiide to the left
finalOffsetX = Math.max(0, Math.floor(Math.abs(offsetX) / slideWidth) * slideWidth);
} else {
// We are less than half-way through a drag
// We are more than half-way through a drag
// Sliiide to the right
finalOffsetX = Math.min(totalWidth - slideWidth, Math.ceil(Math.abs(offsetX) / slideWidth) * slideWidth);
}
_this.slideIndex = Math.ceil(finalOffsetX / slideWidth);
if(e.gesture.velocityX > _this.velocityXThreshold) {
if(e.gesture.direction == 'left') {
@ -2424,6 +2433,9 @@ window.ionic = {
_this.slideToSlide(_this.slideIndex - 1);
}
} else {
// Calculate the new slide index (or "page")
_this.slideIndex = Math.ceil(finalOffsetX / slideWidth);
// Negative offsetX to slide correctly
content.style.webkitTransform = 'translate3d(' + -finalOffsetX + 'px, 0, 0)';
}
@ -2442,7 +2454,7 @@ window.ionic = {
this._initDrag();
// Make sure to grab the element we will slide as our target
content = ionic.DomUtil.getParentOrSelfWithClass(e.target, 'slide-box-items');
content = ionic.DomUtil.getParentOrSelfWithClass(e.target, 'slide-box-slides');
if(!content) {
return;
}
@ -2488,7 +2500,6 @@ window.ionic = {
if(_this._isDragging) {
content = _this._drag.content;
// Grab the new X point, capping it at zero
var newX = _this._drag.startOffsetX + (e.gesture.deltaX / _this._drag.resist);
var rightMostX = -(content.offsetWidth * Math.max(0, content.children.length - 1));
@ -2499,7 +2510,7 @@ window.ionic = {
} else if(newX < rightMostX) {
// Dragging past the rightmost pane, rubber band
//newX = Math.min(rightMostX, + (((e.gesture.deltaX + buttonsWidth) * 0.4)));
_this._drag.resist = (Math.abs(newX) / content.offsetWidth) + 1.4;
_this._drag.resist = (Math.abs(newX) / content.offsetWidth) - 0.6;
}
_this._drag.content.style.webkitTransform = 'translate3d(' + newX + 'px, 0, 0)';