From 1d2aa9cd0fb106c9cf5a934561361fd8bd455cdb Mon Sep 17 00:00:00 2001 From: Maximilian Heinz Date: Thu, 29 Oct 2015 16:18:43 +0100 Subject: [PATCH] fix(defaults.js): add missing default option for mouse events on desktop --- demo/js/jquery.lory.js | 8 +++++++- demo/js/jquery.lory.min.js | 2 +- demo/js/lory.js | 8 +++++++- demo/js/lory.min.js | 2 +- dist/jquery.lory.js | 8 +++++++- dist/jquery.lory.min.js | 2 +- dist/lory.js | 8 +++++++- dist/lory.min.js | 2 +- src/defaults.js | 8 +++++++- 9 files changed, 39 insertions(+), 9 deletions(-) diff --git a/demo/js/jquery.lory.js b/demo/js/jquery.lory.js index 719907a..8468af6 100644 --- a/demo/js/jquery.lory.js +++ b/demo/js/jquery.lory.js @@ -848,7 +848,13 @@ return /******/ (function(modules) { // webpackBootstrap * if emptyString then no class is set * @classNameActiveSlide {string} */ - classNameActiveSlide: 'active' + classNameActiveSlide: 'active', + + /** + * enables mouse events for swiping on desktop devices + * @enableMouseEvents {boolean} + */ + enableMouseEvents: false }; module.exports = exports['default']; diff --git a/demo/js/jquery.lory.min.js b/demo/js/jquery.lory.min.js index 75a77aa..82eb8fc 100644 --- a/demo/js/jquery.lory.min.js +++ b/demo/js/jquery.lory.min.js @@ -1 +1 @@ -!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.lory=t():e.lory=t()}(this,function(){return function(e){function t(i){if(n[i])return n[i].exports;var o=n[i]={exports:{},id:i,loaded:!1};return e[i].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{"default":e}}var o=n(1),r=i(o);$.fn.lory=function(e){return this.each(function(){var t;$.data(this,"lory")||(t=$.extend({},e,$(this).data()),$.data(this,"lory",r["default"](this,t)))})}},function(e,t,n){"use strict";function i(e){return e&&e.__esModule?e:{"default":e}}function o(e,t){function n(e,t){var n=D,i=n.classNameActiveSlide;e.forEach(function(e,t){e.classList.contains(i)&&e.classList.remove(i)}),e[t].classList.add(i)}function i(e){var t=D,n=t.infinite,i=e.slice(0,n),o=e.slice(e.length-n,e.length);return i.forEach(function(e){var t=e.cloneNode(!0);B.appendChild(t)}),o.reverse().forEach(function(e){var t=e.cloneNode(!0);B.insertBefore(t,B.firstChild)}),B.addEventListener(O.transitionEnd,x),f.call(B.children)}function o(t,n,i){u["default"](e,t+".lory."+n,i)}function a(e,t,n){var i=B&&B.style;i&&(i[O.transition+"TimingFunction"]=n,i[O.transition+"Duration"]=t+"ms",i[O.transform]="translate3d("+e+"px, 0, 0)")}function d(e,t){var i=D,r=i.slideSpeed,s=i.slidesToScroll,d=i.infinite,u=i.rewind,c=i.rewindSpeed,l=i.ease,v=i.classNameActiveSlide,m=r,p=t?A+1:A-1,h=Math.round(C-_);o("before","slide",{index:A,nextSlide:p}),"number"!=typeof e&&(e=t?A+s:A-s),e=Math.min(Math.max(e,0),S.length-1),d&&void 0===t&&(e+=d);var b=Math.min(Math.max(-1*S[e].offsetLeft,-1*h),0);u&&Math.abs(N.x)===h&&t&&(b=0,e=0,m=c),a(b,m,l),N.x=b,S[e].offsetLeft<=h&&(A=e),d&&(Math.abs(b)===h&&t&&(A=d),0!==Math.abs(b)||t||(A=S.length-2*d),N.x=-1*S[A].offsetLeft,v&&n(f.call(S),A),P=function(){a(-1*S[A].offsetLeft,0,void 0)}),o("after","slide",{currentSlide:A})}function c(){o("before","init"),O=s["default"](),D=r({},l["default"],t);var a=D,d=a.classNameFrame,u=a.classNameSlideContainer,c=a.classNamePrevCtrl,m=a.classNameNextCtrl,p=a.classNameActiveSlide;j=e.getElementsByClassName(d)[0],B=j.getElementsByClassName(u)[0],k=e.getElementsByClassName(c)[0],T=e.getElementsByClassName(m)[0],N={x:B.offsetLeft,y:B.offsetTop},S=D.infinite?i(f.call(B.children)):f.call(B.children),v(),p&&n(S,A),k&&T&&(k.addEventListener("click",h),T.addEventListener("click",b)),B.addEventListener("touchstart",y),B.addEventListener("mousedown",y),B.addEventListener("click",w),window.addEventListener("resize",M),o("after","init")}function v(){var e=D,t=e.infinite,n=e.ease,i=e.rewindSpeed;C=B.getBoundingClientRect().width||B.offsetWidth,_=j.getBoundingClientRect().width||j.offsetWidth,_===C&&(C=S.reduce(function(e,t){return e+t.getBoundingClientRect().width||t.offsetWidth},0)),A=0,t?(a(-1*S[A+t].offsetLeft,0,null),A+=t,N.x=-1*S[A].offsetLeft):a(0,i,n)}function m(e){d(e)}function p(){return A}function h(){d(!1,!1)}function b(){d(!1,!0)}function E(){o("before","destroy"),B.removeEventListener(O.transitionEnd,x),B.removeEventListener("touchstart",y),window.removeEventListener("resize",M),k&&k.removeEventListener("click",h),T&&T.removeEventListener("click",b),o("after","destroy")}function x(){P&&(P(),P=void 0)}function y(e){var t=void 0,n=D,i=n.enableMouseEvents;i?(t=e.touches?e.touches[0]:e,B.addEventListener("mouseup",g),B.addEventListener("mouseleave",g)):t=e.touches[0];var r=t,a=r.pageX,s=r.pageY;$={x:a,y:s,time:Date.now()},F=void 0,z={},B.addEventListener("touchmove",L),B.addEventListener("mousemove",L),B.addEventListener("touchend",g),B.addEventListener("mouseup",g),B.addEventListener("mouseleave",g),o("on","touchstart",{event:e})}function L(e){var t=void 0,n=D,i=n.enableMouseEvents;t=i?e.touches?e.touches[0]:e:e.touches[0];var r=t,s=r.pageX,d=r.pageY;z={x:s-$.x,y:d-$.y},"undefined"==typeof F&&(F=!!(F||Math.abs(z.x)25||Math.abs(z.x)>_/3,i=!A&&z.x>0||A===S.length-1&&z.x<0,r=z.x<0;F||(n&&!i?d(!1,r):a(N.x,D.snapBackSpeed)),$=void 0,B.removeEventListener("touchmove",L),B.removeEventListener("touchend",g),B.removeEventListener("mousemove",L),B.removeEventListener("mouseup",g),o("on","touchend",{event:e})}function w(e){z.x&&e.preventDefault()}function M(e){o("on","resize",{event:e}),v()}var N=void 0,C=void 0,_=void 0,S=void 0,j=void 0,B=void 0,k=void 0,T=void 0,O=void 0,P=void 0,A=0,D={};"undefined"!=typeof jQuery&&e instanceof jQuery&&(e=e[0]);var $=void 0,z=void 0,F=void 0;return c(),{setup:c,reset:v,slideTo:m,returnIndex:p,prev:h,next:b,destroy:E}}Object.defineProperty(t,"__esModule",{value:!0});var r=Object.assign||function(e){for(var t=1;t25||Math.abs(z.x)>_/3,i=!A&&z.x>0||A===S.length-1&&z.x<0,r=z.x<0;F||(n&&!i?d(!1,r):a(N.x,D.snapBackSpeed)),$=void 0,B.removeEventListener("touchmove",L),B.removeEventListener("touchend",g),B.removeEventListener("mousemove",L),B.removeEventListener("mouseup",g),o("on","touchend",{event:e})}function M(e){z.x&&e.preventDefault()}function w(e){o("on","resize",{event:e}),v()}var N=void 0,C=void 0,_=void 0,S=void 0,j=void 0,B=void 0,k=void 0,T=void 0,O=void 0,P=void 0,A=0,D={};"undefined"!=typeof jQuery&&e instanceof jQuery&&(e=e[0]);var $=void 0,z=void 0,F=void 0;return c(),{setup:c,reset:v,slideTo:m,returnIndex:p,prev:h,next:b,destroy:E}}Object.defineProperty(t,"__esModule",{value:!0});var r=Object.assign||function(e){for(var t=1;t25||Math.abs(F.x)>S/3,o=!A&&F.x>0||A===_.length-1&&F.x<0,r=F.x<0;R||(n&&!o?d(!1,r):a(M.x,D.snapBackSpeed)),z=void 0,B.removeEventListener("touchmove",L),B.removeEventListener("touchend",g),B.removeEventListener("mousemove",L),B.removeEventListener("mouseup",g),i("on","touchend",{event:e})}function w(e){F.x&&e.preventDefault()}function N(e){i("on","resize",{event:e}),v()}var M=void 0,C=void 0,S=void 0,_=void 0,j=void 0,B=void 0,k=void 0,T=void 0,O=void 0,P=void 0,A=0,D={};"undefined"!=typeof jQuery&&e instanceof jQuery&&(e=e[0]);var z=void 0,F=void 0,R=void 0;return u(),{setup:u,reset:v,slideTo:m,returnIndex:p,prev:h,next:b,destroy:E}}Object.defineProperty(t,"__esModule",{value:!0});var r=Object.assign||function(e){for(var t=1;t25||Math.abs(F.x)>S/3,o=!A&&F.x>0||A===_.length-1&&F.x<0,r=F.x<0;R||(n&&!o?d(!1,r):a(N.x,D.snapBackSpeed)),z=void 0,B.removeEventListener("touchmove",L),B.removeEventListener("touchend",g),B.removeEventListener("mousemove",L),B.removeEventListener("mouseup",g),i("on","touchend",{event:e})}function w(e){F.x&&e.preventDefault()}function M(e){i("on","resize",{event:e}),v()}var N=void 0,C=void 0,S=void 0,_=void 0,j=void 0,B=void 0,k=void 0,T=void 0,O=void 0,P=void 0,A=0,D={};"undefined"!=typeof jQuery&&e instanceof jQuery&&(e=e[0]);var z=void 0,F=void 0,R=void 0;return u(),{setup:u,reset:v,slideTo:m,returnIndex:p,prev:h,next:b,destroy:E}}Object.defineProperty(t,"__esModule",{value:!0});var r=Object.assign||function(e){for(var t=1;t25||Math.abs(z.x)>_/3,i=!A&&z.x>0||A===S.length-1&&z.x<0,r=z.x<0;F||(n&&!i?d(!1,r):a(N.x,D.snapBackSpeed)),$=void 0,B.removeEventListener("touchmove",L),B.removeEventListener("touchend",g),B.removeEventListener("mousemove",L),B.removeEventListener("mouseup",g),o("on","touchend",{event:e})}function w(e){z.x&&e.preventDefault()}function M(e){o("on","resize",{event:e}),v()}var N=void 0,C=void 0,_=void 0,S=void 0,j=void 0,B=void 0,k=void 0,T=void 0,O=void 0,P=void 0,A=0,D={};"undefined"!=typeof jQuery&&e instanceof jQuery&&(e=e[0]);var $=void 0,z=void 0,F=void 0;return c(),{setup:c,reset:v,slideTo:m,returnIndex:p,prev:h,next:b,destroy:E}}Object.defineProperty(t,"__esModule",{value:!0});var r=Object.assign||function(e){for(var t=1;t25||Math.abs(z.x)>_/3,i=!A&&z.x>0||A===S.length-1&&z.x<0,r=z.x<0;F||(n&&!i?d(!1,r):a(N.x,D.snapBackSpeed)),$=void 0,B.removeEventListener("touchmove",L),B.removeEventListener("touchend",g),B.removeEventListener("mousemove",L),B.removeEventListener("mouseup",g),o("on","touchend",{event:e})}function M(e){z.x&&e.preventDefault()}function w(e){o("on","resize",{event:e}),v()}var N=void 0,C=void 0,_=void 0,S=void 0,j=void 0,B=void 0,k=void 0,T=void 0,O=void 0,P=void 0,A=0,D={};"undefined"!=typeof jQuery&&e instanceof jQuery&&(e=e[0]);var $=void 0,z=void 0,F=void 0;return c(),{setup:c,reset:v,slideTo:m,returnIndex:p,prev:h,next:b,destroy:E}}Object.defineProperty(t,"__esModule",{value:!0});var r=Object.assign||function(e){for(var t=1;t25||Math.abs(F.x)>S/3,o=!A&&F.x>0||A===_.length-1&&F.x<0,r=F.x<0;R||(n&&!o?d(!1,r):a(M.x,D.snapBackSpeed)),z=void 0,B.removeEventListener("touchmove",L),B.removeEventListener("touchend",g),B.removeEventListener("mousemove",L),B.removeEventListener("mouseup",g),i("on","touchend",{event:e})}function w(e){F.x&&e.preventDefault()}function N(e){i("on","resize",{event:e}),v()}var M=void 0,C=void 0,S=void 0,_=void 0,j=void 0,B=void 0,k=void 0,T=void 0,O=void 0,P=void 0,A=0,D={};"undefined"!=typeof jQuery&&e instanceof jQuery&&(e=e[0]);var z=void 0,F=void 0,R=void 0;return u(),{setup:u,reset:v,slideTo:m,returnIndex:p,prev:h,next:b,destroy:E}}Object.defineProperty(t,"__esModule",{value:!0});var r=Object.assign||function(e){for(var t=1;t25||Math.abs(F.x)>S/3,o=!A&&F.x>0||A===_.length-1&&F.x<0,r=F.x<0;R||(n&&!o?d(!1,r):a(N.x,D.snapBackSpeed)),z=void 0,B.removeEventListener("touchmove",L),B.removeEventListener("touchend",g),B.removeEventListener("mousemove",L),B.removeEventListener("mouseup",g),i("on","touchend",{event:e})}function w(e){F.x&&e.preventDefault()}function M(e){i("on","resize",{event:e}),v()}var N=void 0,C=void 0,S=void 0,_=void 0,j=void 0,B=void 0,k=void 0,T=void 0,O=void 0,P=void 0,A=0,D={};"undefined"!=typeof jQuery&&e instanceof jQuery&&(e=e[0]);var z=void 0,F=void 0,R=void 0;return u(),{setup:u,reset:v,slideTo:m,returnIndex:p,prev:h,next:b,destroy:E}}Object.defineProperty(t,"__esModule",{value:!0});var r=Object.assign||function(e){for(var t=1;t