Skip to content

Commit bf917ff

Browse files
meandmaxmeandmax
committed
fix(lory.js): also remove mouse leave event onTouchend
1 parent 156a0f3 commit bf917ff

10 files changed

Lines changed: 65 additions & 123 deletions

File tree

‎demo/js/jquery.lory.js‎

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -274,12 +274,12 @@ return /******/ (function(modules) { // webpackBootstrap
274274
index = nextIndex;
275275
}
276276

277-
if (infinite) {
278-
if (Math.abs(nextOffset) === maxOffset && direction) {
277+
if (infinite && (Math.abs(nextOffset) === maxOffset || Math.abs(nextOffset) === 0)) {
278+
if (direction) {
279279
index = infinite;
280280
}
281281

282-
if (Math.abs(nextOffset) === 0 && !direction) {
282+
if (!direction) {
283283
index = slides.length - infinite * 2;
284284
}
285285

@@ -458,27 +458,22 @@ return /******/ (function(modules) { // webpackBootstrap
458458
}
459459

460460
function onTouchstart(event) {
461-
var touches = undefined;
462-
463461
var _options6 = options;
464462
var enableMouseEvents = _options6.enableMouseEvents;
465463

466-
if (enableMouseEvents) {
467-
touches = event.touches ? event.touches[0] : event;
464+
var touches = event.touches ? event.touches[0] : event;
468465

466+
if (enableMouseEvents) {
469467
slideContainer.addEventListener('mousemove', onTouchmove);
470468
slideContainer.addEventListener('mouseup', onTouchend);
471469
slideContainer.addEventListener('mouseleave', onTouchend);
472-
} else {
473-
touches = event.touches[0];
474-
475-
slideContainer.addEventListener('touchmove', onTouchmove);
476-
slideContainer.addEventListener('touchend', onTouchend);
477470
}
478471

479-
var _touches = touches;
480-
var pageX = _touches.pageX;
481-
var pageY = _touches.pageY;
472+
slideContainer.addEventListener('touchmove', onTouchmove);
473+
slideContainer.addEventListener('touchend', onTouchend);
474+
475+
var pageX = touches.pageX;
476+
var pageY = touches.pageY;
482477

483478
touchOffset = {
484479
x: pageX,
@@ -496,20 +491,9 @@ return /******/ (function(modules) { // webpackBootstrap
496491
}
497492

498493
function onTouchmove(event) {
499-
var touches = undefined;
500-
501-
var _options7 = options;
502-
var enableMouseEvents = _options7.enableMouseEvents;
503-
504-
if (enableMouseEvents) {
505-
touches = event.touches ? event.touches[0] : event;
506-
} else {
507-
touches = event.touches[0];
508-
}
509-
510-
var _touches2 = touches;
511-
var pageX = _touches2.pageX;
512-
var pageY = _touches2.pageY;
494+
var touches = event.touches ? event.touches[0] : event;
495+
var pageX = touches.pageX;
496+
var pageY = touches.pageY;
513497

514498
delta = {
515499
x: pageX - touchOffset.x,
@@ -581,6 +565,7 @@ return /******/ (function(modules) { // webpackBootstrap
581565
slideContainer.removeEventListener('touchend', onTouchend);
582566
slideContainer.removeEventListener('mousemove', onTouchmove);
583567
slideContainer.removeEventListener('mouseup', onTouchend);
568+
slideContainer.removeEventListener('mouseleave', onTouchend);
584569

585570
dispatchSliderEvent('on', 'touchend', {
586571
event: event

‎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 & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -256,12 +256,12 @@ return /******/ (function(modules) { // webpackBootstrap
256256
index = nextIndex;
257257
}
258258

259-
if (infinite) {
260-
if (Math.abs(nextOffset) === maxOffset && direction) {
259+
if (infinite && (Math.abs(nextOffset) === maxOffset || Math.abs(nextOffset) === 0)) {
260+
if (direction) {
261261
index = infinite;
262262
}
263263

264-
if (Math.abs(nextOffset) === 0 && !direction) {
264+
if (!direction) {
265265
index = slides.length - infinite * 2;
266266
}
267267

@@ -440,27 +440,22 @@ return /******/ (function(modules) { // webpackBootstrap
440440
}
441441

442442
function onTouchstart(event) {
443-
var touches = undefined;
444-
445443
var _options6 = options;
446444
var enableMouseEvents = _options6.enableMouseEvents;
447445

448-
if (enableMouseEvents) {
449-
touches = event.touches ? event.touches[0] : event;
446+
var touches = event.touches ? event.touches[0] : event;
450447

448+
if (enableMouseEvents) {
451449
slideContainer.addEventListener('mousemove', onTouchmove);
452450
slideContainer.addEventListener('mouseup', onTouchend);
453451
slideContainer.addEventListener('mouseleave', onTouchend);
454-
} else {
455-
touches = event.touches[0];
456-
457-
slideContainer.addEventListener('touchmove', onTouchmove);
458-
slideContainer.addEventListener('touchend', onTouchend);
459452
}
460453

461-
var _touches = touches;
462-
var pageX = _touches.pageX;
463-
var pageY = _touches.pageY;
454+
slideContainer.addEventListener('touchmove', onTouchmove);
455+
slideContainer.addEventListener('touchend', onTouchend);
456+
457+
var pageX = touches.pageX;
458+
var pageY = touches.pageY;
464459

465460
touchOffset = {
466461
x: pageX,
@@ -478,20 +473,9 @@ return /******/ (function(modules) { // webpackBootstrap
478473
}
479474

480475
function onTouchmove(event) {
481-
var touches = undefined;
482-
483-
var _options7 = options;
484-
var enableMouseEvents = _options7.enableMouseEvents;
485-
486-
if (enableMouseEvents) {
487-
touches = event.touches ? event.touches[0] : event;
488-
} else {
489-
touches = event.touches[0];
490-
}
491-
492-
var _touches2 = touches;
493-
var pageX = _touches2.pageX;
494-
var pageY = _touches2.pageY;
476+
var touches = event.touches ? event.touches[0] : event;
477+
var pageX = touches.pageX;
478+
var pageY = touches.pageY;
495479

496480
delta = {
497481
x: pageX - touchOffset.x,
@@ -563,6 +547,7 @@ return /******/ (function(modules) { // webpackBootstrap
563547
slideContainer.removeEventListener('touchend', onTouchend);
564548
slideContainer.removeEventListener('mousemove', onTouchmove);
565549
slideContainer.removeEventListener('mouseup', onTouchend);
550+
slideContainer.removeEventListener('mouseleave', onTouchend);
566551

567552
dispatchSliderEvent('on', 'touchend', {
568553
event: event

0 commit comments

Comments
 (0)