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.

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

Scrollable now accepts a "clones" setting. #866

Open
wants to merge 10 commits into
base: dev
Choose a base branch
from
23 changes: 12 additions & 11 deletions src/scrollable/scrollable.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
conf: {
activeClass: 'active',
circular: false,
clones: 1,
clonedClass: 'cloned',
disabledClass: 'disabled',
easing: 'swing',
Expand Down Expand Up @@ -201,10 +202,11 @@

// circular loop
if (conf.circular) {

var cloned1 = self.getItems().slice(-1).clone().prependTo(itemWrap),
cloned2 = self.getItems().eq(1).clone().appendTo(itemWrap);

var items = self.getItems(),
cloned1 = items.slice(-conf.clones).clone(),
cloned2 = items.slice(0, conf.clones).clone();
cloned1.prependTo(itemWrap);
cloned2.appendTo(itemWrap);
cloned1.add(cloned2).addClass(conf.clonedClass);

self.onBeforeSeek(function(e, i, time) {
Expand All @@ -216,17 +218,16 @@
2. seek to correct position with 0 speed
*/
if (i == -1) {
self.seekTo(cloned1, time, function() {
self.end(0);
});
self.seekTo(cloned1.last(), time, function() {
self.end(0);
});
return e.preventDefault();

} else if (i == self.getSize()) {
self.seekTo(cloned2, time, function() {
self.begin(0);
});
self.seekTo(cloned2.first(), time, function() {
self.begin(0);
});
}

});

// seek over the cloned item
Expand Down
12 changes: 7 additions & 5 deletions src/toolbox/toolbox.mousewheel.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,27 @@

// shared event handler
function wheelHandler( event ) {

switch ( event.type ) {

// FF2 has incorrect event positions
case "mousemove":
return $.extend( event.data, { // store the correct properties
// store the correct properties
return $.extend( event.originalEvent.data, {
clientX: event.clientX, clientY: event.clientY,
pageX: event.pageX, pageY: event.pageY
});

// firefox
case "DOMMouseScroll":
$.extend( event, event.data ); // fix event properties in FF2
event.delta = -event.detail / 3; // normalize delta
// fix event properties in FF2
$.extend( event.originalEvent, event.originalEvent.data );
// normalize delta
event.delta = -event.originalEvent.detail / 3;
break;

// IE, opera, safari
case "mousewheel":
event.delta = event.wheelDelta / 120;
event.delta = event.originalEvent.wheelDelta / 120;
break;
}

Expand Down