Skip to content

Support end-to-end loops when sliding pictures #22

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

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

Support end-to-end loops when sliding pictures #22

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
34 changes: 9 additions & 25 deletions jquery.touchslider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,13 @@ http://touchslider.com

switching.moving = true;
clearTimeout(autoPlayTimeout);

if (indexInViewport !== -1) {
nodeLeft = endCoords[indexInViewport];
// add node if not exist
} else {
var i, nodeIndex = slides.index(node);

// set position in viewport
indexInViewport = undefined;

Expand Down Expand Up @@ -166,11 +167,11 @@ http://touchslider.com

// set start coordinates
if (indexInViewport === 0) {
nodeLeft = endCoords[1] - (node.outerWidth() + options.margin);
nodeLeft = opt.dirX == -1 ? endCoords[1] - (node.outerWidth() + options.margin) : crossLeft(node);
crossLeft(node, nodeLeft);
endCoords[indexInViewport] = nodeLeft;
} else if (indexInViewport === inViewport.length - 1) {
nodeLeft = endCoords[indexInViewport - 1] + slides.eq(inViewport[indexInViewport - 1]).outerWidth() + options.margin;
nodeLeft = opt.dirX == 1 ? endCoords[indexInViewport - 1] + slides.eq(inViewport[indexInViewport - 1]).outerWidth() + options.margin : crossLeft(node);
crossLeft(node, nodeLeft);
endCoords[indexInViewport] = nodeLeft;
} else {
Expand Down Expand Up @@ -288,7 +289,7 @@ http://touchslider.com
// add slide to left
if (diffX > 0) {
// while is used in case of fast moving
while (inViewport[0] !== 0 && scrollerLeft + endCoords[0] + diffX > options.margin) {
while (scrollerLeft + endCoords[0] + diffX > options.margin) {
add = slides.eq(inViewport[0] - 1); // or "first.index() - 1"
addLeft = endCoords[0] - add.outerWidth() - options.margin;
crossLeft(add, addLeft);
Expand All @@ -298,37 +299,20 @@ http://touchslider.com
first = add;
}
}
// deceleration in left
if ((
(diffX > 0 && scrollerLeft + endCoords[0] + diffX > 0)
|| (diffX < 0 && scrollerLeft + endCoords[0] > 0)
) && inViewport[0] === 0
) {
deceleration = Math.min(Math.round((switching.leftCount + endCoords[0]) / 4), viewport.innerWidth() / 2);
diffX = deceleration - (scrollerLeft + endCoords[0]);
}

// add slide to right
if (diffX < 0) {
while (!last.is(slides.last()) && scrollerLeft + endCoords[lastIndex] + diffX + last.outerWidth() + options.margin < viewport.innerWidth()) {
add = slides.eq(inViewport[lastIndex] + 1);
//while (!last.is(slides.last()) && scrollerLeft + endCoords[lastIndex] + diffX + last.outerWidth() + options.margin < viewport.innerWidth()) {
while (scrollerLeft + endCoords[lastIndex] + diffX + last.outerWidth() + options.margin < viewport.innerWidth()) {
add = !last.is(slides.last()) ? slides.eq(inViewport[lastIndex] + 1) : slides.eq(0);
addLeft = endCoords[lastIndex] + last.outerWidth() + options.margin;
crossLeft(add, addLeft);
endCoords.push(addLeft);
inViewport.push(inViewport[lastIndex++] + 1);
last = add;
}
}
// deceleration in right
if ((
(diffX > 0 && scrollerLeft + endCoords[lastIndex] < 0)
|| (diffX < 0 && scrollerLeft + endCoords[lastIndex] + diffX < 0)
) && last.is(slides.last())
) {
deceleration = Math.max(Math.round((switching.leftCount + endCoords[lastIndex]) / 4), - viewport.innerWidth() / 2);
diffX = deceleration - (scrollerLeft + endCoords[lastIndex]);
}


crossLeft(scroller, scrollerLeft + diffX);
},

Expand Down