Skip to content

Commit 156a0f3

Browse files
author
Maximilian Heinz
committed
fix(lory.js): fix mouseevents - fix setActiveElement
1 parent 1d2aa9c commit 156a0f3

9 files changed

Lines changed: 92 additions & 82 deletions

File tree

‎demo/js/jquery.lory.js‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -285,15 +285,15 @@ return /******/ (function(modules) { // webpackBootstrap
285285

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

288-
if (classNameActiveSlide) {
289-
setActiveElement(slice.call(slides), index);
290-
}
291-
292288
transitionEndCallback = function () {
293289
translate(slides[index].offsetLeft * -1, 0, undefined);
294290
};
295291
}
296292

293+
if (classNameActiveSlide) {
294+
setActiveElement(slice.call(slides), index);
295+
}
296+
297297
dispatchSliderEvent('after', 'slide', {
298298
currentSlide: index
299299
});
@@ -314,6 +314,7 @@ return /******/ (function(modules) { // webpackBootstrap
314314
var classNameSlideContainer = _options4.classNameSlideContainer;
315315
var classNamePrevCtrl = _options4.classNamePrevCtrl;
316316
var classNameNextCtrl = _options4.classNameNextCtrl;
317+
var enableMouseEvents = _options4.enableMouseEvents;
317318
var classNameActiveSlide = _options4.classNameActiveSlide;
318319

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

346347
slideContainer.addEventListener('touchstart', onTouchstart);
347-
slideContainer.addEventListener('mousedown', onTouchstart);
348-
slideContainer.addEventListener('click', onClick);
348+
349+
if (enableMouseEvents) {
350+
slideContainer.addEventListener('mousedown', onTouchstart);
351+
slideContainer.addEventListener('click', onClick);
352+
}
349353

350354
window.addEventListener('resize', onResize);
351355

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

469+
slideContainer.addEventListener('mousemove', onTouchmove);
465470
slideContainer.addEventListener('mouseup', onTouchend);
466471
slideContainer.addEventListener('mouseleave', onTouchend);
467472
} else {
468473
touches = event.touches[0];
474+
475+
slideContainer.addEventListener('touchmove', onTouchmove);
476+
slideContainer.addEventListener('touchend', onTouchend);
469477
}
470478

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

483491
delta = {};
484492

485-
slideContainer.addEventListener('touchmove', onTouchmove);
486-
slideContainer.addEventListener('mousemove', onTouchmove);
487-
slideContainer.addEventListener('touchend', onTouchend);
488-
slideContainer.addEventListener('mouseup', onTouchend);
489-
slideContainer.addEventListener('mouseleave', onTouchend);
490-
491493
dispatchSliderEvent('on', 'touchstart', {
492494
event: event
493495
});

‎demo/js/jquery.lory.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/js/lory.js‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -267,15 +267,15 @@ return /******/ (function(modules) { // webpackBootstrap
267267

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

270-
if (classNameActiveSlide) {
271-
setActiveElement(slice.call(slides), index);
272-
}
273-
274270
transitionEndCallback = function () {
275271
translate(slides[index].offsetLeft * -1, 0, undefined);
276272
};
277273
}
278274

275+
if (classNameActiveSlide) {
276+
setActiveElement(slice.call(slides), index);
277+
}
278+
279279
dispatchSliderEvent('after', 'slide', {
280280
currentSlide: index
281281
});
@@ -296,6 +296,7 @@ return /******/ (function(modules) { // webpackBootstrap
296296
var classNameSlideContainer = _options4.classNameSlideContainer;
297297
var classNamePrevCtrl = _options4.classNamePrevCtrl;
298298
var classNameNextCtrl = _options4.classNameNextCtrl;
299+
var enableMouseEvents = _options4.enableMouseEvents;
299300
var classNameActiveSlide = _options4.classNameActiveSlide;
300301

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

328329
slideContainer.addEventListener('touchstart', onTouchstart);
329-
slideContainer.addEventListener('mousedown', onTouchstart);
330-
slideContainer.addEventListener('click', onClick);
330+
331+
if (enableMouseEvents) {
332+
slideContainer.addEventListener('mousedown', onTouchstart);
333+
slideContainer.addEventListener('click', onClick);
334+
}
331335

332336
window.addEventListener('resize', onResize);
333337

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

451+
slideContainer.addEventListener('mousemove', onTouchmove);
447452
slideContainer.addEventListener('mouseup', onTouchend);
448453
slideContainer.addEventListener('mouseleave', onTouchend);
449454
} else {
450455
touches = event.touches[0];
456+
457+
slideContainer.addEventListener('touchmove', onTouchmove);
458+
slideContainer.addEventListener('touchend', onTouchend);
451459
}
452460

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

465473
delta = {};
466474

467-
slideContainer.addEventListener('touchmove', onTouchmove);
468-
slideContainer.addEventListener('mousemove', onTouchmove);
469-
slideContainer.addEventListener('touchend', onTouchend);
470-
slideContainer.addEventListener('mouseup', onTouchend);
471-
slideContainer.addEventListener('mouseleave', onTouchend);
472-
473475
dispatchSliderEvent('on', 'touchstart', {
474476
event: event
475477
});

0 commit comments

Comments
 (0)