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.

Sign up for GitHub

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

Jump to bottom

fix scrolling issues on mobile #50

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix scrolling issues on mobile #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 81 additions & 20 deletions dragend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,21 @@

isTouch = 'ontouchstart' in win,

isTouchEvent = false,
touches = {
start: 0,
startX: 0,
startY: 0,
current: 0,
currentX: 0,
currentY: 0,
diff: 0,
abs: 0
},

isScrolling = false,


startEvent = isTouch ? 'touchstart' : 'mousedown',
moveEvent = isTouch ? 'touchmove' : 'mousemove',
endEvent = isTouch ? 'touchend' : 'mouseup',
Expand Down Expand Up @@ -380,41 +395,87 @@
event.stopPropagation();
}

addEventListener(doc.body, moveEvent, this._onMove);
addEventListener(doc.body, endEvent, this._onEnd);
if(this.isTouched) return;

this.isTouched = true;
isTouchEvent = (event.type === 'touchstart');

if (!isTouchEvent || event.targetTouches.length === 1) {
var pageX = isTouchEvent ? event.targetTouches[0].pageX : (event.pageX || event.clientX);
var pageY = isTouchEvent ? event.targetTouches[0].pageY : (event.pageY || event.clientY);

//Start Touches to check the scrolling
touches.startX = touches.currentX = pageX;
touches.startY = touches.currentY = pageY;
touches.start = touches.current = (this.settings.direction=='horizontal') ? pageX : pageY;

this.startCoords = getCoords(event);
isScrolling = undefined;

this.settings.onDragStart.call( this, event );
addEventListener(doc.body, moveEvent, this._onMove);
addEventListener(doc.body, endEvent, this._onEnd);

this.startCoords = getCoords(event);

this.settings.onDragStart.call(this, event);

}

},

_onMove: function( event ) {

event = event.originalEvent || event;

// ensure swiping with one touch and not pinching
if ( event.touches && event.touches.length > 1 || event.scale && event.scale !== 1) return;
// ensure swiping with one touch and not pinching
if (event.touches && event.touches.length > 1 || event.scale && event.scale !== 1) return;

event.preventDefault();
if (this.settings.stopPropagation) {
event.stopPropagation();
}
// ensure element is touched
if (!this.isTouched) return;

var parsedEvent = this._parseEvent(event),
coordinates = this._checkOverscroll( parsedEvent.direction , - parsedEvent.distanceX, - parsedEvent.distanceY );

this.settings.onDrag.call( this, this.activeElement, parsedEvent, coordinates.overscroll, event );
var pageX = isTouchEvent ? event.targetTouches[0].pageX : (event.pageX || event.clientX);
var pageY = isTouchEvent ? event.targetTouches[0].pageY : (event.pageY || event.clientY);

if ( !this.preventScroll ) {
this._scroll( coordinates );
}

//check for scrolling
if (typeof isScrolling === 'undefined' && this.settings.direction=='horizontal') {
isScrolling = !!(isScrolling || Math.abs(pageY - touches.startY) > Math.abs(pageX - touches.startX));
}
if (typeof isScrolling === 'undefined' && this.settings.direction!='horizontal') {
isScrolling = !!(isScrolling || Math.abs(pageY - touches.startY) < Math.abs(pageX - touches.startX));
}
if (isScrolling) {
this.isTouched = false;
return;
}

if (!isTouchEvent || event.touches.length === 1) {

event.preventDefault();
if (this.settings.stopPropagation) {
event.stopPropagation();
}

var parsedEvent = this._parseEvent(event),
coordinates = this._checkOverscroll(parsedEvent.direction, -parsedEvent.distanceX, -parsedEvent.distanceY);

this.settings.onDrag.call(this, this.activeElement, parsedEvent, coordinates.overscroll, event);

if (!this.preventScroll) {
this._scroll(coordinates);
}

}
},

_onEnd: function( event ) {

event = event.originalEvent || event;

// ensure element is touched
if (!this.isTouched) return;
this.isTouched = false;

if (this.settings.stopPropagation) {
event.stopPropagation();
}
Expand All @@ -423,10 +484,10 @@

this.startCoords = { x: 0, y: 0 };

if ( Math.abs(parsedEvent.distanceX) > this.settings.minDragDistance || Math.abs(parsedEvent.distanceY) > this.settings.minDragDistance) {
this.swipe( parsedEvent.direction );
} else if (Math.abs(parsedEvent.distanceX) > 0 || Math.abs(parsedEvent.distanceY) > 0) {
this._scrollToPage();
if (Math.abs(parsedEvent.distanceX) > this.settings.minDragDistance || Math.abs(parsedEvent.distanceY) > this.settings.minDragDistance) {
this.swipe(parsedEvent.direction);
} else {
this._scrollToPage();
}

this.settings.onDragEnd.call( this, this.container, this.activeElement, this.page + 1, event );
Expand Down