Skip to content

Commit

Permalink
fix(lory.js): fix mouseevents - fix setActiveElement
Browse files Browse the repository at this point in the history
  • Loading branch information
Maximilian Heinz committed Oct 29, 2015
1 parent 1d2aa9c commit 156a0f3
Show file tree
Hide file tree
Showing 9 changed files with 92 additions and 82 deletions.
26 changes: 14 additions & 12 deletions demo/js/jquery.lory.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,15 +285,15 @@ return /******/ (function(modules) { // webpackBootstrap

position.x = slides[index].offsetLeft * -1;

if (classNameActiveSlide) {
setActiveElement(slice.call(slides), index);
}

transitionEndCallback = function () {
translate(slides[index].offsetLeft * -1, 0, undefined);
};
}

if (classNameActiveSlide) {
setActiveElement(slice.call(slides), index);
}

dispatchSliderEvent('after', 'slide', {
currentSlide: index
});
Expand All @@ -314,6 +314,7 @@ return /******/ (function(modules) { // webpackBootstrap
var classNameSlideContainer = _options4.classNameSlideContainer;
var classNamePrevCtrl = _options4.classNamePrevCtrl;
var classNameNextCtrl = _options4.classNameNextCtrl;
var enableMouseEvents = _options4.enableMouseEvents;
var classNameActiveSlide = _options4.classNameActiveSlide;

frame = slider.getElementsByClassName(classNameFrame)[0];
Expand Down Expand Up @@ -344,8 +345,11 @@ return /******/ (function(modules) { // webpackBootstrap
}

slideContainer.addEventListener('touchstart', onTouchstart);
slideContainer.addEventListener('mousedown', onTouchstart);
slideContainer.addEventListener('click', onClick);

if (enableMouseEvents) {
slideContainer.addEventListener('mousedown', onTouchstart);
slideContainer.addEventListener('click', onClick);
}

window.addEventListener('resize', onResize);

Expand Down Expand Up @@ -462,10 +466,14 @@ return /******/ (function(modules) { // webpackBootstrap
if (enableMouseEvents) {
touches = event.touches ? event.touches[0] : event;

slideContainer.addEventListener('mousemove', onTouchmove);
slideContainer.addEventListener('mouseup', onTouchend);
slideContainer.addEventListener('mouseleave', onTouchend);
} else {
touches = event.touches[0];

slideContainer.addEventListener('touchmove', onTouchmove);
slideContainer.addEventListener('touchend', onTouchend);
}

var _touches = touches;
Expand All @@ -482,12 +490,6 @@ return /******/ (function(modules) { // webpackBootstrap

delta = {};

slideContainer.addEventListener('touchmove', onTouchmove);
slideContainer.addEventListener('mousemove', onTouchmove);
slideContainer.addEventListener('touchend', onTouchend);
slideContainer.addEventListener('mouseup', onTouchend);
slideContainer.addEventListener('mouseleave', onTouchend);

dispatchSliderEvent('on', 'touchstart', {
event: event
});
Expand Down
2 changes: 1 addition & 1 deletion demo/js/jquery.lory.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 14 additions & 12 deletions demo/js/lory.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,15 +267,15 @@ return /******/ (function(modules) { // webpackBootstrap

position.x = slides[index].offsetLeft * -1;

if (classNameActiveSlide) {
setActiveElement(slice.call(slides), index);
}

transitionEndCallback = function () {
translate(slides[index].offsetLeft * -1, 0, undefined);
};
}

if (classNameActiveSlide) {
setActiveElement(slice.call(slides), index);
}

dispatchSliderEvent('after', 'slide', {
currentSlide: index
});
Expand All @@ -296,6 +296,7 @@ return /******/ (function(modules) { // webpackBootstrap
var classNameSlideContainer = _options4.classNameSlideContainer;
var classNamePrevCtrl = _options4.classNamePrevCtrl;
var classNameNextCtrl = _options4.classNameNextCtrl;
var enableMouseEvents = _options4.enableMouseEvents;
var classNameActiveSlide = _options4.classNameActiveSlide;

frame = slider.getElementsByClassName(classNameFrame)[0];
Expand Down Expand Up @@ -326,8 +327,11 @@ return /******/ (function(modules) { // webpackBootstrap
}

slideContainer.addEventListener('touchstart', onTouchstart);
slideContainer.addEventListener('mousedown', onTouchstart);
slideContainer.addEventListener('click', onClick);

if (enableMouseEvents) {
slideContainer.addEventListener('mousedown', onTouchstart);
slideContainer.addEventListener('click', onClick);
}

window.addEventListener('resize', onResize);

Expand Down Expand Up @@ -444,10 +448,14 @@ return /******/ (function(modules) { // webpackBootstrap
if (enableMouseEvents) {
touches = event.touches ? event.touches[0] : event;

slideContainer.addEventListener('mousemove', onTouchmove);
slideContainer.addEventListener('mouseup', onTouchend);
slideContainer.addEventListener('mouseleave', onTouchend);
} else {
touches = event.touches[0];

slideContainer.addEventListener('touchmove', onTouchmove);
slideContainer.addEventListener('touchend', onTouchend);
}

var _touches = touches;
Expand All @@ -464,12 +472,6 @@ return /******/ (function(modules) { // webpackBootstrap

delta = {};

slideContainer.addEventListener('touchmove', onTouchmove);
slideContainer.addEventListener('mousemove', onTouchmove);
slideContainer.addEventListener('touchend', onTouchend);
slideContainer.addEventListener('mouseup', onTouchend);
slideContainer.addEventListener('mouseleave', onTouchend);

dispatchSliderEvent('on', 'touchstart', {
event: event
});
Expand Down
Loading

0 comments on commit 156a0f3

Please sign in to comment.