From 6393a0261f54a9352d08209614b7360546a8049d Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Mon, 20 Oct 2014 13:24:22 +0200 Subject: [PATCH] bump release --- bower.json | 2 +- dist/angular-carousel.js | 11 ++++++----- dist/angular-carousel.min.js | 4 ++-- package.json | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/bower.json b/bower.json index d768f2c..cf9aeed 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "angular-carousel", "description": "Angular Carousel - Mobile friendly touch carousel for AngularJS", - "version": "0.3.3", + "version": "0.3.4", "homepage": "http://revolunet.github.com/angular-carousel", "author": "Julien Bouquillon ", "repository": { diff --git a/dist/angular-carousel.js b/dist/angular-carousel.js index e4b7735..6d561b3 100644 --- a/dist/angular-carousel.js +++ b/dist/angular-carousel.js @@ -1,6 +1,6 @@ /** * Angular Carousel - Mobile friendly touch carousel for AngularJS - * @version v0.3.3 - 2014-10-19 + * @version v0.3.4 - 2014-10-20 * @link http://revolunet.github.com/angular-carousel * @author Julien Bouquillon * @license MIT License, http://www.opensource.org/licenses/MIT @@ -616,7 +616,7 @@ angular.module('angular-carousel.shifty', []) .factory('Tweenable', function() { - (function (root) { + (function (root, window) { /*! * Shifty Core * By Jeremy Kahn - jeremyckahn@gmail.com @@ -1068,7 +1068,8 @@ angular.module('angular-carousel.shifty', []) return Tweenable; } ()); - + + window.Tweenable = Tweenable; /*! * All equations are adapted from Thomas Fuchs' [Scripty2](https://github.com/madrobby/scripty2/blob/master/src/effects/transitions/penner.js). * @@ -1989,9 +1990,9 @@ angular.module('angular-carousel.shifty', []) } (Tweenable)); - }(this)); + }(this, window)); - return this.Tweenable; + return window.Tweenable; }); (function() { diff --git a/dist/angular-carousel.min.js b/dist/angular-carousel.min.js index 15bdf74..d17bc54 100644 --- a/dist/angular-carousel.min.js +++ b/dist/angular-carousel.min.js @@ -1,8 +1,8 @@ /** * Angular Carousel - Mobile friendly touch carousel for AngularJS - * @version v0.3.3 - 2014-10-19 + * @version v0.3.4 - 2014-10-20 * @link http://revolunet.github.com/angular-carousel * @author Julien Bouquillon * @license MIT License, http://www.opensource.org/licenses/MIT */ -angular.module("angular-carousel",["ngTouch","angular-carousel.shifty"]),angular.module("angular-carousel").directive("rnCarouselAutoSlide",["$timeout",function(a){return{restrict:"A",link:function(b,c,d){var e=Math.round(1e3*parseFloat(d.rnCarouselAutoSlide)),f=increment=!1,g=c.children().length;b.carouselExposedIndex||(b.carouselExposedIndex=0),stopAutoplay=function(){angular.isDefined(f)&&a.cancel(f),f=void 0},increment=function(){b.carouselExposedIndex=b.carouselExposedIndex\n●')}]),function(){"use strict";angular.module("angular-carousel").service("DeviceCapabilities",function(){function a(){var a="transform";return["webkit","moz","o","ms"].every(function(b){var c="-"+b+"-transform";return"undefined"!=typeof document.body.style[c]?(a=c,!1):!0}),a}function b(){var a,b=document.createElement("p"),c={webkitTransform:"-webkit-transform",msTransform:"-ms-transform",transform:"transform"};document.body.insertBefore(b,null);for(var d in c)void 0!==b.style[d]&&(b.style[d]="translate3d(1px,1px,1px)",a=window.getComputedStyle(b).getPropertyValue(c[d]));return document.body.removeChild(b),void 0!==a&&a.length>0&&"none"!==a}return{has3d:b(),transformProperty:a()}}).service("computeCarouselSlideStyle",["DeviceCapabilities",function(a){return function(b,c,d){var e,f={display:"inline-block"},g=100*b+c,h=a.has3d?"translate3d("+g+"%, 0, 0)":"translate3d("+g+"%, 0)",i=(100-Math.abs(g))/100;if("fadeAndSlide"==d)f[a.transformProperty]=h,e=0,Math.abs(g)<100&&(e=.3+.7*i),f.opacity=e;else if("hexagon"==d){var j=100,k=0,l=60*(i-1);j=-100*b>c?100:0,k=-100*b>c?l:-l,f[a.transformProperty]=h+" rotateY("+k+"deg)",f["transform-origin"]=j+"% 50%"}else if("zoom"==d){f[a.transformProperty]=h;var m=1;Math.abs(g)<100&&(m=1+2*(1-i)),f[a.transformProperty]+=" scale("+m+")",f["transform-origin"]="50% 50%",e=0,Math.abs(g)<100&&(e=.3+.7*i),f.opacity=e}else f[a.transformProperty]=h;return f}}]).service("createStyleString",function(){return function(a){var b=[];return angular.forEach(a,function(a,c){b.push(c+":"+a)}),b.join(";")}}).directive("rnCarousel",["$swipe","$window","$document","$parse","$compile","$timeout","$interval","computeCarouselSlideStyle","createStyleString","Tweenable",function(a,b,c,d,e,f,g,h,i,j){{var k=0;b.requestAnimationFrame||b.webkitRequestAnimationFrame||b.mozRequestAnimationFrame}return{restrict:"A",scope:!0,compile:function(l,m){var n,o,p=l[0].querySelector("li"),q=p?p.attributes:[],r=!1,s=!1;return["ng-repeat","data-ng-repeat","ng:repeat","x-ng-repeat"].every(function(a){var b=q[a];if(angular.isDefined(b)){var c=b.value.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/),d=c[3];if(n=c[1],o=c[2],n)return angular.isDefined(m.rnCarouselBuffered)&&(s=!0,b.value=n+" in "+o+"|carouselSlice:carouselBufferIndex:carouselBufferSize",d&&(b.value+=" track by "+d)),r=!0,!1}return!0}),function(l,m,n){function p(){return m[0].querySelectorAll(":scope > li")}function q(a){K=!0,z({x:a.clientX,y:a.clientY},a)}function t(a){var b=100*l.carouselBufferIndex+a;angular.forEach(p(),function(a,c){a.style.cssText=i(h(c,b,H.transitionType))})}function u(a,b){if(void 0===a&&(a=l.carouselIndex),b=b||{},b.animate===!1||"none"===H.transitionType)return N=!1,J=-100*a,l.carouselIndex=a,A(),void 0;N=!0;var c=new j;c.tween({from:{x:J},to:{x:-100*a},duration:H.transitionDuration,easing:H.transitionEasing,step:function(a){t(a.x)},finish:function(){N=!1,l.$apply(function(){l.carouselIndex=a,J=-100*a,A()})}})}function v(){return m[0].getBoundingClientRect().width}function w(){L=v()}function x(a){return c.bind("mouseup",q),w(),M=m[0].querySelector("li").getBoundingClientRect().left,C=!0,D=a.x,!1}function y(a){if(!N){var b,c;if(C&&(b=a.x,c=D-b,c>2||-2>c)){K=!0;var d=J+100*-c/L;t(d)}return!1}}function z(a,b){if((!b||K)&&(c.unbind("mouseup",q),C=!1,K=!1,E=D-a.x,0!==E&&!N))if(J+=100*-E/L,H.isSequential){var d=H.moveTreshold*L,e=-E,f=-Math[e>=0?"ceil":"floor"](e/L),g=Math.abs(e)>d;F&&f+l.carouselIndex>=F.length&&(f=F.length-1-l.carouselIndex),f+l.carouselIndex<0&&(f=-l.carouselIndex);var h=g?f:0;E=l.carouselIndex+h,u(E)}else l.$apply(function(){l.carouselIndex=parseInt(-J/100,10),A()})}function A(){var a=0,b=(l.carouselBufferSize-1)/2;s?(a=l.carouselIndex<=b?0:F&&F.lengthF.length-l.carouselBufferSize?F.length-l.carouselBufferSize:l.carouselIndex-b,l.carouselBufferIndex=a,f(function(){t(J)},0,!1)):f(function(){t(J)},0,!1)}function B(){w(),u()}k++;var C,D,E,F,G={transitionType:n.rnCarouselTransition||"slide",transitionEasing:"easeTo",transitionDuration:300,isSequential:!0,autoSlideDuration:3,bufferSize:5,moveTreshold:.1},H=angular.extend({},G),I=!1,J=0,K=!1,L=null,M=null,N=!1;if(void 0!==n.rnCarouselControls){var O='
\n \n \n
';m.append(e(angular.element(O))(l))}a.bind(m,{start:x,move:y,end:z,cancel:function(a){z({},a)}}),l.nextSlide=function(a){var b=l.carouselIndex+1;b>F.length-1&&(b=0),N||u(b,a)},l.prevSlide=function(a){var b=l.carouselIndex-1;0>b&&(b=F.length-1),u(b,a)};var P=!0;l.carouselIndex=0,r||(F=[],angular.forEach(p(),function(a,b){F.push({id:b})}));var Q;if(void 0!==n.rnCarouselAutoSlide){var R=parseInt(n.rnCarouselAutoSlide,10)||H.autoSlideDuration;Q=g(function(){N||C||l.nextSlide()},1e3*R)}if(n.rnCarouselIndex){var S=function(a){T.assign(l.$parent,a)},T=d(n.rnCarouselIndex);angular.isFunction(T.assign)?(l.$watch("carouselIndex",function(a){N||S(a)}),l.$parent.$watch(T,function(a){void 0!==a&&null!==a&&(F&&a>=F.length?(a=F.length-1,S(a)):F&&0>a&&(a=0,S(a)),N||u(a,{animate:!P}),P=!1)}),I=!0):isNaN(n.rnCarouselIndex)||u(parseInt(n.rnCarouselIndex,10),{animate:!1})}else u(0,{animate:!P}),P=!1;n.rnCarouselLocked&&l.$watch(n.rnCarouselLocked,function(a){N=a===!0?!0:!1}),r&&l.$watchCollection(o,function(a){F=a,u(l.carouselIndex)}),l.$on("$destroy",function(){c.unbind("mouseup",q)}),l.carouselBufferIndex=0,l.carouselBufferSize=H.bufferSize;var U=angular.element(b);U.bind("orientationchange",B),U.bind("resize",B),l.$on("$destroy",function(){c.unbind("mouseup",q),U.unbind("orientationchange",B),U.unbind("resize",B)})}}}}])}(),angular.module("angular-carousel.shifty",[]).factory("Tweenable",function(){return function(a){"undefined"==typeof SHIFTY_DEBUG_NOW&&(SHIFTY_DEBUG_NOW=function(){return+new Date});var b=function(){"use strict";function b(){}function c(a,b){var c;for(c in a)Object.hasOwnProperty.call(a,c)&&b(c)}function d(a,b){return c(b,function(c){a[c]=b[c]}),a}function e(a,b){c(b,function(c){"undefined"==typeof a[c]&&(a[c]=b[c])})}function f(a,b,c,d,e,f,h){var i,j=(a-f)/e;for(i in b)b.hasOwnProperty(i)&&(b[i]=g(c[i],d[i],l[h[i]],j));return b}function g(a,b,c,d){return a+(b-a)*c(d)}function h(a,b){var d=k.prototype.filter,e=a._filterArgs;c(d,function(c){"undefined"!=typeof d[c][b]&&d[c][b].apply(a,e)})}function i(a,b,c,d,e,g,i,j,k){s=b+c,t=Math.min(r(),s),u=t>=s,a.isPlaying()&&!u?(k(a._timeoutHandler,p),h(a,"beforeTween"),f(t,d,e,g,c,b,i),h(a,"afterTween"),j(d)):u&&(j(g),a.stop(!0))}function j(a,b){var d={};return"string"==typeof b?c(a,function(a){d[a]=b}):c(a,function(a){d[a]||(d[a]=b[a]||n)}),d}function k(a,b){this._currentState=a||{},this._configured=!1,this._scheduleFunction=m,"undefined"!=typeof b&&this.setConfig(b)}var l,m,n="linear",o=500,p=1e3/60,q=Date.now?Date.now:function(){return+new Date},r=SHIFTY_DEBUG_NOW?SHIFTY_DEBUG_NOW:q;m="undefined"!=typeof window?window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||window.mozCancelRequestAnimationFrame&&window.mozRequestAnimationFrame||setTimeout:setTimeout;var s,t,u;return k.prototype.tween=function(a){return this._isTweening?this:(void 0===a&&this._configured||this.setConfig(a),this._start(this.get()),this.resume())},k.prototype.setConfig=function(a){a=a||{},this._configured=!0,this._pausedAtTime=null,this._start=a.start||b,this._step=a.step||b,this._finish=a.finish||b,this._duration=a.duration||o,this._currentState=a.from||this.get(),this._originalState=this.get(),this._targetState=a.to||this.get(),this._timestamp=r();var c=this._currentState,d=this._targetState;return e(d,c),this._easing=j(c,a.easing||n),this._filterArgs=[c,this._originalState,d,this._easing],h(this,"tweenCreated"),this},k.prototype.get=function(){return d({},this._currentState)},k.prototype.set=function(a){this._currentState=a},k.prototype.pause=function(){return this._pausedAtTime=r(),this._isPaused=!0,this},k.prototype.resume=function(){this._isPaused&&(this._timestamp+=r()-this._pausedAtTime),this._isPaused=!1,this._isTweening=!0;var a=this;return this._timeoutHandler=function(){i(a,a._timestamp,a._duration,a._currentState,a._originalState,a._targetState,a._easing,a._step,a._scheduleFunction)},this._timeoutHandler(),this},k.prototype.stop=function(a){return this._isTweening=!1,this._isPaused=!1,this._timeoutHandler=b,a&&(d(this._currentState,this._targetState),h(this,"afterTweenEnd"),this._finish.call(this,this._currentState)),this},k.prototype.isPlaying=function(){return this._isTweening&&!this._isPaused},k.prototype.setScheduleFunction=function(a){this._scheduleFunction=a},k.prototype.dispose=function(){var a;for(a in this)this.hasOwnProperty(a)&&delete this[a]},k.prototype.filter={},k.prototype.formula={linear:function(a){return a}},l=k.prototype.formula,d(k,{now:r,each:c,tweenProps:f,tweenProp:g,applyFilter:h,shallowCopy:d,defaults:e,composeEasingObject:j}),"function"==typeof SHIFTY_DEBUG_NOW&&(a.timeoutHandler=i),"object"==typeof exports?module.exports=k:"function"==typeof define&&define.amd?define(function(){return k}):"undefined"==typeof a.Tweenable&&(a.Tweenable=k),k}();!function(){b.shallowCopy(b.prototype.formula,{easeInQuad:function(a){return Math.pow(a,2)},easeOutQuad:function(a){return-(Math.pow(a-1,2)-1)},easeInOutQuad:function(a){return(a/=.5)<1?.5*Math.pow(a,2):-.5*((a-=2)*a-2)},easeInCubic:function(a){return Math.pow(a,3)},easeOutCubic:function(a){return Math.pow(a-1,3)+1},easeInOutCubic:function(a){return(a/=.5)<1?.5*Math.pow(a,3):.5*(Math.pow(a-2,3)+2)},easeInQuart:function(a){return Math.pow(a,4)},easeOutQuart:function(a){return-(Math.pow(a-1,4)-1)},easeInOutQuart:function(a){return(a/=.5)<1?.5*Math.pow(a,4):-.5*((a-=2)*Math.pow(a,3)-2)},easeInQuint:function(a){return Math.pow(a,5)},easeOutQuint:function(a){return Math.pow(a-1,5)+1},easeInOutQuint:function(a){return(a/=.5)<1?.5*Math.pow(a,5):.5*(Math.pow(a-2,5)+2)},easeInSine:function(a){return-Math.cos(a*(Math.PI/2))+1},easeOutSine:function(a){return Math.sin(a*(Math.PI/2))},easeInOutSine:function(a){return-.5*(Math.cos(Math.PI*a)-1)},easeInExpo:function(a){return 0===a?0:Math.pow(2,10*(a-1))},easeOutExpo:function(a){return 1===a?1:-Math.pow(2,-10*a)+1},easeInOutExpo:function(a){return 0===a?0:1===a?1:(a/=.5)<1?.5*Math.pow(2,10*(a-1)):.5*(-Math.pow(2,-10*--a)+2)},easeInCirc:function(a){return-(Math.sqrt(1-a*a)-1)},easeOutCirc:function(a){return Math.sqrt(1-Math.pow(a-1,2))},easeInOutCirc:function(a){return(a/=.5)<1?-.5*(Math.sqrt(1-a*a)-1):.5*(Math.sqrt(1-(a-=2)*a)+1)},easeOutBounce:function(a){return 1/2.75>a?7.5625*a*a:2/2.75>a?7.5625*(a-=1.5/2.75)*a+.75:2.5/2.75>a?7.5625*(a-=2.25/2.75)*a+.9375:7.5625*(a-=2.625/2.75)*a+.984375},easeInBack:function(a){var b=1.70158;return a*a*((b+1)*a-b)},easeOutBack:function(a){var b=1.70158;return(a-=1)*a*((b+1)*a+b)+1},easeInOutBack:function(a){var b=1.70158;return(a/=.5)<1?.5*a*a*(((b*=1.525)+1)*a-b):.5*((a-=2)*a*(((b*=1.525)+1)*a+b)+2)},elastic:function(a){return-1*Math.pow(4,-8*a)*Math.sin(2*(6*a-1)*Math.PI/2)+1},swingFromTo:function(a){var b=1.70158;return(a/=.5)<1?.5*a*a*(((b*=1.525)+1)*a-b):.5*((a-=2)*a*(((b*=1.525)+1)*a+b)+2)},swingFrom:function(a){var b=1.70158;return a*a*((b+1)*a-b)},swingTo:function(a){var b=1.70158;return(a-=1)*a*((b+1)*a+b)+1},bounce:function(a){return 1/2.75>a?7.5625*a*a:2/2.75>a?7.5625*(a-=1.5/2.75)*a+.75:2.5/2.75>a?7.5625*(a-=2.25/2.75)*a+.9375:7.5625*(a-=2.625/2.75)*a+.984375},bouncePast:function(a){return 1/2.75>a?7.5625*a*a:2/2.75>a?2-(7.5625*(a-=1.5/2.75)*a+.75):2.5/2.75>a?2-(7.5625*(a-=2.25/2.75)*a+.9375):2-(7.5625*(a-=2.625/2.75)*a+.984375)},easeFromTo:function(a){return(a/=.5)<1?.5*Math.pow(a,4):-.5*((a-=2)*Math.pow(a,3)-2)},easeFrom:function(a){return Math.pow(a,4)},easeTo:function(a){return Math.pow(a,.25)}})}(),function(){function a(a,b,c,d,e,f){function g(a){return((n*a+o)*a+p)*a}function h(a){return((q*a+r)*a+s)*a}function i(a){return(3*n*a+2*o)*a+p}function j(a){return 1/(200*a)}function k(a,b){return h(m(a,b))}function l(a){return a>=0?a:0-a}function m(a,b){var c,d,e,f,h,j;for(e=a,j=0;8>j;j++){if(f=g(e)-a,l(f)e)return c;if(e>d)return d;for(;d>c;){if(f=g(e),l(f-a)f?c=e:d=e,e=.5*(d-c)+c}return e}var n=0,o=0,p=0,q=0,r=0,s=0;return p=3*b,o=3*(d-b)-p,n=1-p-o,s=3*c,r=3*(e-c)-s,q=1-s-r,k(a,j(f))}function c(b,c,d,e){return function(f){return a(f,b,c,d,e,1)}}b.setBezierFunction=function(a,d,e,f,g){var h=c(d,e,f,g);return h.x1=d,h.y1=e,h.x2=f,h.y2=g,b.prototype.formula[a]=h},b.unsetBezierFunction=function(a){delete b.prototype.formula[a]}}(),function(){function a(a,c,d,e,f){return b.tweenProps(e,c,a,d,1,0,f)}var c=new b;c._filterArgs=[],b.interpolate=function(d,e,f,g){var h=b.shallowCopy({},d),i=b.composeEasingObject(d,g||"linear");c.set({});var j=c._filterArgs;j.length=0,j[0]=h,j[1]=d,j[2]=e,j[3]=i,b.applyFilter(c,"tweenCreated"),b.applyFilter(c,"beforeTween");var k=a(d,h,e,f,i);return b.applyFilter(c,"afterTween"),k}}(),function(a){function b(a,b){B.length=0;var c,d=a.length;for(c=0;d>c;c++)B.push("_"+b+"_"+c);return B}function c(a){var b=a.match(v);return b?(1===b.length||a[0].match(u))&&b.unshift(""):b=["",""],b.join(A)}function d(b){a.each(b,function(a){var c=b[a];"string"==typeof c&&c.match(z)&&(b[a]=e(c))})}function e(a){return i(z,a,f)}function f(a){var b=g(a);return"rgb("+b[0]+","+b[1]+","+b[2]+")"}function g(a){return a=a.replace(/#/,""),3===a.length&&(a=a.split(""),a=a[0]+a[0]+a[1]+a[1]+a[2]+a[2]),C[0]=h(a.substr(0,2)),C[1]=h(a.substr(2,2)),C[2]=h(a.substr(4,2)),C}function h(a){return parseInt(a,16)}function i(a,b,c){var d=b.match(a),e=b.replace(a,A);if(d)for(var f,g=d.length,h=0;g>h;h++)f=d.shift(),e=e.replace(A,c(f));return e}function j(a){return i(x,a,k)}function k(a){for(var b=a.match(w),c=b.length,d=a.match(y)[0],e=0;c>e;e++)d+=parseInt(b[e],10)+",";return d=d.slice(0,-1)+")"}function l(d){var e={};return a.each(d,function(a){var f=d[a];if("string"==typeof f){var g=r(f);e[a]={formatString:c(f),chunkNames:b(g,a)}}}),e}function m(b,c){a.each(c,function(a){for(var d=b[a],e=r(d),f=e.length,g=0;f>g;g++)b[c[a].chunkNames[g]]=+e[g];delete b[a]})}function n(b,c){a.each(c,function(a){var d=b[a],e=o(b,c[a].chunkNames),f=p(e,c[a].chunkNames);d=q(c[a].formatString,f),b[a]=j(d)})}function o(a,b){for(var c,d={},e=b.length,f=0;e>f;f++)c=b[f],d[c]=a[c],delete a[c];return d}function p(a,b){D.length=0;for(var c=b.length,d=0;c>d;d++)D.push(a[b[d]]);return D}function q(a,b){for(var c=a,d=b.length,e=0;d>e;e++)c=c.replace(A,+b[e].toFixed(4));return c}function r(a){return a.match(w)}function s(b,c){a.each(c,function(a){for(var d=c[a],e=d.chunkNames,f=e.length,g=b[a].split(" "),h=g[g.length-1],i=0;f>i;i++)b[e[i]]=g[i]||h;delete b[a]})}function t(b,c){a.each(c,function(a){for(var d=c[a],e=d.chunkNames,f=e.length,g="",h=0;f>h;h++)g+=" "+b[e[h]],delete b[e[h]];b[a]=g.substr(1)})}var u=/(\d|\-|\.)/,v=/([^\-0-9\.]+)/g,w=/[0-9.\-]+/g,x=new RegExp("rgb\\("+w.source+/,\s*/.source+w.source+/,\s*/.source+w.source+"\\)","g"),y=/^.*\(/,z=/#([0-9]|[a-f]){3,6}/gi,A="VAL",B=[],C=[],D=[];a.prototype.filter.token={tweenCreated:function(a,b,c){d(a),d(b),d(c),this._tokenData=l(a)},beforeTween:function(a,b,c,d){s(d,this._tokenData),m(a,this._tokenData),m(b,this._tokenData),m(c,this._tokenData)},afterTween:function(a,b,c,d){n(a,this._tokenData),n(b,this._tokenData),n(c,this._tokenData),t(d,this._tokenData)}}}(b)}(this),this.Tweenable}),function(){"use strict";angular.module("angular-carousel").filter("carouselSlice",function(){return function(a,b,c){return angular.isArray(a)?a.slice(b,b+c):angular.isObject(a)?a:void 0}})}(); \ No newline at end of file +angular.module("angular-carousel",["ngTouch","angular-carousel.shifty"]),angular.module("angular-carousel").directive("rnCarouselAutoSlide",["$timeout",function(a){return{restrict:"A",link:function(b,c,d){var e=Math.round(1e3*parseFloat(d.rnCarouselAutoSlide)),f=increment=!1,g=c.children().length;b.carouselExposedIndex||(b.carouselExposedIndex=0),stopAutoplay=function(){angular.isDefined(f)&&a.cancel(f),f=void 0},increment=function(){b.carouselExposedIndex=b.carouselExposedIndex\n●')}]),function(){"use strict";angular.module("angular-carousel").service("DeviceCapabilities",function(){function a(){var a="transform";return["webkit","moz","o","ms"].every(function(b){var c="-"+b+"-transform";return"undefined"!=typeof document.body.style[c]?(a=c,!1):!0}),a}function b(){var a,b=document.createElement("p"),c={webkitTransform:"-webkit-transform",msTransform:"-ms-transform",transform:"transform"};document.body.insertBefore(b,null);for(var d in c)void 0!==b.style[d]&&(b.style[d]="translate3d(1px,1px,1px)",a=window.getComputedStyle(b).getPropertyValue(c[d]));return document.body.removeChild(b),void 0!==a&&a.length>0&&"none"!==a}return{has3d:b(),transformProperty:a()}}).service("computeCarouselSlideStyle",["DeviceCapabilities",function(a){return function(b,c,d){var e,f={display:"inline-block"},g=100*b+c,h=a.has3d?"translate3d("+g+"%, 0, 0)":"translate3d("+g+"%, 0)",i=(100-Math.abs(g))/100;if("fadeAndSlide"==d)f[a.transformProperty]=h,e=0,Math.abs(g)<100&&(e=.3+.7*i),f.opacity=e;else if("hexagon"==d){var j=100,k=0,l=60*(i-1);j=-100*b>c?100:0,k=-100*b>c?l:-l,f[a.transformProperty]=h+" rotateY("+k+"deg)",f["transform-origin"]=j+"% 50%"}else if("zoom"==d){f[a.transformProperty]=h;var m=1;Math.abs(g)<100&&(m=1+2*(1-i)),f[a.transformProperty]+=" scale("+m+")",f["transform-origin"]="50% 50%",e=0,Math.abs(g)<100&&(e=.3+.7*i),f.opacity=e}else f[a.transformProperty]=h;return f}}]).service("createStyleString",function(){return function(a){var b=[];return angular.forEach(a,function(a,c){b.push(c+":"+a)}),b.join(";")}}).directive("rnCarousel",["$swipe","$window","$document","$parse","$compile","$timeout","$interval","computeCarouselSlideStyle","createStyleString","Tweenable",function(a,b,c,d,e,f,g,h,i,j){{var k=0;b.requestAnimationFrame||b.webkitRequestAnimationFrame||b.mozRequestAnimationFrame}return{restrict:"A",scope:!0,compile:function(l,m){var n,o,p=l[0].querySelector("li"),q=p?p.attributes:[],r=!1,s=!1;return["ng-repeat","data-ng-repeat","ng:repeat","x-ng-repeat"].every(function(a){var b=q[a];if(angular.isDefined(b)){var c=b.value.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/),d=c[3];if(n=c[1],o=c[2],n)return angular.isDefined(m.rnCarouselBuffered)&&(s=!0,b.value=n+" in "+o+"|carouselSlice:carouselBufferIndex:carouselBufferSize",d&&(b.value+=" track by "+d)),r=!0,!1}return!0}),function(l,m,n){function p(){return m[0].querySelectorAll(":scope > li")}function q(a){K=!0,z({x:a.clientX,y:a.clientY},a)}function t(a){var b=100*l.carouselBufferIndex+a;angular.forEach(p(),function(a,c){a.style.cssText=i(h(c,b,H.transitionType))})}function u(a,b){if(void 0===a&&(a=l.carouselIndex),b=b||{},b.animate===!1||"none"===H.transitionType)return N=!1,J=-100*a,l.carouselIndex=a,A(),void 0;N=!0;var c=new j;c.tween({from:{x:J},to:{x:-100*a},duration:H.transitionDuration,easing:H.transitionEasing,step:function(a){t(a.x)},finish:function(){N=!1,l.$apply(function(){l.carouselIndex=a,J=-100*a,A()})}})}function v(){return m[0].getBoundingClientRect().width}function w(){L=v()}function x(a){return c.bind("mouseup",q),w(),M=m[0].querySelector("li").getBoundingClientRect().left,C=!0,D=a.x,!1}function y(a){if(!N){var b,c;if(C&&(b=a.x,c=D-b,c>2||-2>c)){K=!0;var d=J+100*-c/L;t(d)}return!1}}function z(a,b){if((!b||K)&&(c.unbind("mouseup",q),C=!1,K=!1,E=D-a.x,0!==E&&!N))if(J+=100*-E/L,H.isSequential){var d=H.moveTreshold*L,e=-E,f=-Math[e>=0?"ceil":"floor"](e/L),g=Math.abs(e)>d;F&&f+l.carouselIndex>=F.length&&(f=F.length-1-l.carouselIndex),f+l.carouselIndex<0&&(f=-l.carouselIndex);var h=g?f:0;E=l.carouselIndex+h,u(E)}else l.$apply(function(){l.carouselIndex=parseInt(-J/100,10),A()})}function A(){var a=0,b=(l.carouselBufferSize-1)/2;s?(a=l.carouselIndex<=b?0:F&&F.lengthF.length-l.carouselBufferSize?F.length-l.carouselBufferSize:l.carouselIndex-b,l.carouselBufferIndex=a,f(function(){t(J)},0,!1)):f(function(){t(J)},0,!1)}function B(){w(),u()}k++;var C,D,E,F,G={transitionType:n.rnCarouselTransition||"slide",transitionEasing:"easeTo",transitionDuration:300,isSequential:!0,autoSlideDuration:3,bufferSize:5,moveTreshold:.1},H=angular.extend({},G),I=!1,J=0,K=!1,L=null,M=null,N=!1;if(void 0!==n.rnCarouselControls){var O='
\n \n \n
';m.append(e(angular.element(O))(l))}a.bind(m,{start:x,move:y,end:z,cancel:function(a){z({},a)}}),l.nextSlide=function(a){var b=l.carouselIndex+1;b>F.length-1&&(b=0),N||u(b,a)},l.prevSlide=function(a){var b=l.carouselIndex-1;0>b&&(b=F.length-1),u(b,a)};var P=!0;l.carouselIndex=0,r||(F=[],angular.forEach(p(),function(a,b){F.push({id:b})}));var Q;if(void 0!==n.rnCarouselAutoSlide){var R=parseInt(n.rnCarouselAutoSlide,10)||H.autoSlideDuration;Q=g(function(){N||C||l.nextSlide()},1e3*R)}if(n.rnCarouselIndex){var S=function(a){T.assign(l.$parent,a)},T=d(n.rnCarouselIndex);angular.isFunction(T.assign)?(l.$watch("carouselIndex",function(a){N||S(a)}),l.$parent.$watch(T,function(a){void 0!==a&&null!==a&&(F&&a>=F.length?(a=F.length-1,S(a)):F&&0>a&&(a=0,S(a)),N||u(a,{animate:!P}),P=!1)}),I=!0):isNaN(n.rnCarouselIndex)||u(parseInt(n.rnCarouselIndex,10),{animate:!1})}else u(0,{animate:!P}),P=!1;n.rnCarouselLocked&&l.$watch(n.rnCarouselLocked,function(a){N=a===!0?!0:!1}),r&&l.$watchCollection(o,function(a){F=a,u(l.carouselIndex)}),l.$on("$destroy",function(){c.unbind("mouseup",q)}),l.carouselBufferIndex=0,l.carouselBufferSize=H.bufferSize;var U=angular.element(b);U.bind("orientationchange",B),U.bind("resize",B),l.$on("$destroy",function(){c.unbind("mouseup",q),U.unbind("orientationchange",B),U.unbind("resize",B)})}}}}])}(),angular.module("angular-carousel.shifty",[]).factory("Tweenable",function(){return function(a,b){"undefined"==typeof SHIFTY_DEBUG_NOW&&(SHIFTY_DEBUG_NOW=function(){return+new Date});var c=function(){"use strict";function c(){}function d(a,b){var c;for(c in a)Object.hasOwnProperty.call(a,c)&&b(c)}function e(a,b){return d(b,function(c){a[c]=b[c]}),a}function f(a,b){d(b,function(c){"undefined"==typeof a[c]&&(a[c]=b[c])})}function g(a,b,c,d,e,f,g){var i,j=(a-f)/e;for(i in b)b.hasOwnProperty(i)&&(b[i]=h(c[i],d[i],m[g[i]],j));return b}function h(a,b,c,d){return a+(b-a)*c(d)}function i(a,b){var c=l.prototype.filter,e=a._filterArgs;d(c,function(d){"undefined"!=typeof c[d][b]&&c[d][b].apply(a,e)})}function j(a,b,c,d,e,f,h,j,k){t=b+c,u=Math.min(s(),t),v=u>=t,a.isPlaying()&&!v?(k(a._timeoutHandler,q),i(a,"beforeTween"),g(u,d,e,f,c,b,h),i(a,"afterTween"),j(d)):v&&(j(f),a.stop(!0))}function k(a,b){var c={};return"string"==typeof b?d(a,function(a){c[a]=b}):d(a,function(a){c[a]||(c[a]=b[a]||o)}),c}function l(a,b){this._currentState=a||{},this._configured=!1,this._scheduleFunction=n,"undefined"!=typeof b&&this.setConfig(b)}var m,n,o="linear",p=500,q=1e3/60,r=Date.now?Date.now:function(){return+new Date},s=SHIFTY_DEBUG_NOW?SHIFTY_DEBUG_NOW:r;n="undefined"!=typeof b?b.requestAnimationFrame||b.webkitRequestAnimationFrame||b.oRequestAnimationFrame||b.msRequestAnimationFrame||b.mozCancelRequestAnimationFrame&&b.mozRequestAnimationFrame||setTimeout:setTimeout;var t,u,v;return l.prototype.tween=function(a){return this._isTweening?this:(void 0===a&&this._configured||this.setConfig(a),this._start(this.get()),this.resume())},l.prototype.setConfig=function(a){a=a||{},this._configured=!0,this._pausedAtTime=null,this._start=a.start||c,this._step=a.step||c,this._finish=a.finish||c,this._duration=a.duration||p,this._currentState=a.from||this.get(),this._originalState=this.get(),this._targetState=a.to||this.get(),this._timestamp=s();var b=this._currentState,d=this._targetState;return f(d,b),this._easing=k(b,a.easing||o),this._filterArgs=[b,this._originalState,d,this._easing],i(this,"tweenCreated"),this},l.prototype.get=function(){return e({},this._currentState)},l.prototype.set=function(a){this._currentState=a},l.prototype.pause=function(){return this._pausedAtTime=s(),this._isPaused=!0,this},l.prototype.resume=function(){this._isPaused&&(this._timestamp+=s()-this._pausedAtTime),this._isPaused=!1,this._isTweening=!0;var a=this;return this._timeoutHandler=function(){j(a,a._timestamp,a._duration,a._currentState,a._originalState,a._targetState,a._easing,a._step,a._scheduleFunction)},this._timeoutHandler(),this},l.prototype.stop=function(a){return this._isTweening=!1,this._isPaused=!1,this._timeoutHandler=c,a&&(e(this._currentState,this._targetState),i(this,"afterTweenEnd"),this._finish.call(this,this._currentState)),this},l.prototype.isPlaying=function(){return this._isTweening&&!this._isPaused},l.prototype.setScheduleFunction=function(a){this._scheduleFunction=a},l.prototype.dispose=function(){var a;for(a in this)this.hasOwnProperty(a)&&delete this[a]},l.prototype.filter={},l.prototype.formula={linear:function(a){return a}},m=l.prototype.formula,e(l,{now:s,each:d,tweenProps:g,tweenProp:h,applyFilter:i,shallowCopy:e,defaults:f,composeEasingObject:k}),"function"==typeof SHIFTY_DEBUG_NOW&&(a.timeoutHandler=j),"object"==typeof exports?module.exports=l:"function"==typeof define&&define.amd?define(function(){return l}):"undefined"==typeof a.Tweenable&&(a.Tweenable=l),l}();b.Tweenable=c,function(){c.shallowCopy(c.prototype.formula,{easeInQuad:function(a){return Math.pow(a,2)},easeOutQuad:function(a){return-(Math.pow(a-1,2)-1)},easeInOutQuad:function(a){return(a/=.5)<1?.5*Math.pow(a,2):-.5*((a-=2)*a-2)},easeInCubic:function(a){return Math.pow(a,3)},easeOutCubic:function(a){return Math.pow(a-1,3)+1},easeInOutCubic:function(a){return(a/=.5)<1?.5*Math.pow(a,3):.5*(Math.pow(a-2,3)+2)},easeInQuart:function(a){return Math.pow(a,4)},easeOutQuart:function(a){return-(Math.pow(a-1,4)-1)},easeInOutQuart:function(a){return(a/=.5)<1?.5*Math.pow(a,4):-.5*((a-=2)*Math.pow(a,3)-2)},easeInQuint:function(a){return Math.pow(a,5)},easeOutQuint:function(a){return Math.pow(a-1,5)+1},easeInOutQuint:function(a){return(a/=.5)<1?.5*Math.pow(a,5):.5*(Math.pow(a-2,5)+2)},easeInSine:function(a){return-Math.cos(a*(Math.PI/2))+1},easeOutSine:function(a){return Math.sin(a*(Math.PI/2))},easeInOutSine:function(a){return-.5*(Math.cos(Math.PI*a)-1)},easeInExpo:function(a){return 0===a?0:Math.pow(2,10*(a-1))},easeOutExpo:function(a){return 1===a?1:-Math.pow(2,-10*a)+1},easeInOutExpo:function(a){return 0===a?0:1===a?1:(a/=.5)<1?.5*Math.pow(2,10*(a-1)):.5*(-Math.pow(2,-10*--a)+2)},easeInCirc:function(a){return-(Math.sqrt(1-a*a)-1)},easeOutCirc:function(a){return Math.sqrt(1-Math.pow(a-1,2))},easeInOutCirc:function(a){return(a/=.5)<1?-.5*(Math.sqrt(1-a*a)-1):.5*(Math.sqrt(1-(a-=2)*a)+1)},easeOutBounce:function(a){return 1/2.75>a?7.5625*a*a:2/2.75>a?7.5625*(a-=1.5/2.75)*a+.75:2.5/2.75>a?7.5625*(a-=2.25/2.75)*a+.9375:7.5625*(a-=2.625/2.75)*a+.984375},easeInBack:function(a){var b=1.70158;return a*a*((b+1)*a-b)},easeOutBack:function(a){var b=1.70158;return(a-=1)*a*((b+1)*a+b)+1},easeInOutBack:function(a){var b=1.70158;return(a/=.5)<1?.5*a*a*(((b*=1.525)+1)*a-b):.5*((a-=2)*a*(((b*=1.525)+1)*a+b)+2)},elastic:function(a){return-1*Math.pow(4,-8*a)*Math.sin(2*(6*a-1)*Math.PI/2)+1},swingFromTo:function(a){var b=1.70158;return(a/=.5)<1?.5*a*a*(((b*=1.525)+1)*a-b):.5*((a-=2)*a*(((b*=1.525)+1)*a+b)+2)},swingFrom:function(a){var b=1.70158;return a*a*((b+1)*a-b)},swingTo:function(a){var b=1.70158;return(a-=1)*a*((b+1)*a+b)+1},bounce:function(a){return 1/2.75>a?7.5625*a*a:2/2.75>a?7.5625*(a-=1.5/2.75)*a+.75:2.5/2.75>a?7.5625*(a-=2.25/2.75)*a+.9375:7.5625*(a-=2.625/2.75)*a+.984375},bouncePast:function(a){return 1/2.75>a?7.5625*a*a:2/2.75>a?2-(7.5625*(a-=1.5/2.75)*a+.75):2.5/2.75>a?2-(7.5625*(a-=2.25/2.75)*a+.9375):2-(7.5625*(a-=2.625/2.75)*a+.984375)},easeFromTo:function(a){return(a/=.5)<1?.5*Math.pow(a,4):-.5*((a-=2)*Math.pow(a,3)-2)},easeFrom:function(a){return Math.pow(a,4)},easeTo:function(a){return Math.pow(a,.25)}})}(),function(){function a(a,b,c,d,e,f){function g(a){return((n*a+o)*a+p)*a}function h(a){return((q*a+r)*a+s)*a}function i(a){return(3*n*a+2*o)*a+p}function j(a){return 1/(200*a)}function k(a,b){return h(m(a,b))}function l(a){return a>=0?a:0-a}function m(a,b){var c,d,e,f,h,j;for(e=a,j=0;8>j;j++){if(f=g(e)-a,l(f)e)return c;if(e>d)return d;for(;d>c;){if(f=g(e),l(f-a)f?c=e:d=e,e=.5*(d-c)+c}return e}var n=0,o=0,p=0,q=0,r=0,s=0;return p=3*b,o=3*(d-b)-p,n=1-p-o,s=3*c,r=3*(e-c)-s,q=1-s-r,k(a,j(f))}function b(b,c,d,e){return function(f){return a(f,b,c,d,e,1)}}c.setBezierFunction=function(a,d,e,f,g){var h=b(d,e,f,g);return h.x1=d,h.y1=e,h.x2=f,h.y2=g,c.prototype.formula[a]=h},c.unsetBezierFunction=function(a){delete c.prototype.formula[a]}}(),function(){function a(a,b,d,e,f){return c.tweenProps(e,b,a,d,1,0,f)}var b=new c;b._filterArgs=[],c.interpolate=function(d,e,f,g){var h=c.shallowCopy({},d),i=c.composeEasingObject(d,g||"linear");b.set({});var j=b._filterArgs;j.length=0,j[0]=h,j[1]=d,j[2]=e,j[3]=i,c.applyFilter(b,"tweenCreated"),c.applyFilter(b,"beforeTween");var k=a(d,h,e,f,i);return c.applyFilter(b,"afterTween"),k}}(),function(a){function b(a,b){B.length=0;var c,d=a.length;for(c=0;d>c;c++)B.push("_"+b+"_"+c);return B}function c(a){var b=a.match(v);return b?(1===b.length||a[0].match(u))&&b.unshift(""):b=["",""],b.join(A)}function d(b){a.each(b,function(a){var c=b[a];"string"==typeof c&&c.match(z)&&(b[a]=e(c))})}function e(a){return i(z,a,f)}function f(a){var b=g(a);return"rgb("+b[0]+","+b[1]+","+b[2]+")"}function g(a){return a=a.replace(/#/,""),3===a.length&&(a=a.split(""),a=a[0]+a[0]+a[1]+a[1]+a[2]+a[2]),C[0]=h(a.substr(0,2)),C[1]=h(a.substr(2,2)),C[2]=h(a.substr(4,2)),C}function h(a){return parseInt(a,16)}function i(a,b,c){var d=b.match(a),e=b.replace(a,A);if(d)for(var f,g=d.length,h=0;g>h;h++)f=d.shift(),e=e.replace(A,c(f));return e}function j(a){return i(x,a,k)}function k(a){for(var b=a.match(w),c=b.length,d=a.match(y)[0],e=0;c>e;e++)d+=parseInt(b[e],10)+",";return d=d.slice(0,-1)+")"}function l(d){var e={};return a.each(d,function(a){var f=d[a];if("string"==typeof f){var g=r(f);e[a]={formatString:c(f),chunkNames:b(g,a)}}}),e}function m(b,c){a.each(c,function(a){for(var d=b[a],e=r(d),f=e.length,g=0;f>g;g++)b[c[a].chunkNames[g]]=+e[g];delete b[a]})}function n(b,c){a.each(c,function(a){var d=b[a],e=o(b,c[a].chunkNames),f=p(e,c[a].chunkNames);d=q(c[a].formatString,f),b[a]=j(d)})}function o(a,b){for(var c,d={},e=b.length,f=0;e>f;f++)c=b[f],d[c]=a[c],delete a[c];return d}function p(a,b){D.length=0;for(var c=b.length,d=0;c>d;d++)D.push(a[b[d]]);return D}function q(a,b){for(var c=a,d=b.length,e=0;d>e;e++)c=c.replace(A,+b[e].toFixed(4));return c}function r(a){return a.match(w)}function s(b,c){a.each(c,function(a){for(var d=c[a],e=d.chunkNames,f=e.length,g=b[a].split(" "),h=g[g.length-1],i=0;f>i;i++)b[e[i]]=g[i]||h;delete b[a]})}function t(b,c){a.each(c,function(a){for(var d=c[a],e=d.chunkNames,f=e.length,g="",h=0;f>h;h++)g+=" "+b[e[h]],delete b[e[h]];b[a]=g.substr(1)})}var u=/(\d|\-|\.)/,v=/([^\-0-9\.]+)/g,w=/[0-9.\-]+/g,x=new RegExp("rgb\\("+w.source+/,\s*/.source+w.source+/,\s*/.source+w.source+"\\)","g"),y=/^.*\(/,z=/#([0-9]|[a-f]){3,6}/gi,A="VAL",B=[],C=[],D=[];a.prototype.filter.token={tweenCreated:function(a,b,c){d(a),d(b),d(c),this._tokenData=l(a)},beforeTween:function(a,b,c,d){s(d,this._tokenData),m(a,this._tokenData),m(b,this._tokenData),m(c,this._tokenData)},afterTween:function(a,b,c,d){n(a,this._tokenData),n(b,this._tokenData),n(c,this._tokenData),t(d,this._tokenData)}}}(c)}(this,window),window.Tweenable}),function(){"use strict";angular.module("angular-carousel").filter("carouselSlice",function(){return function(a,b,c){return angular.isArray(a)?a.slice(b,b+c):angular.isObject(a)?a:void 0}})}(); \ No newline at end of file diff --git a/package.json b/package.json index 306edb7..d68354e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "angular-carousel", "description": "Angular Carousel - Mobile friendly touch carousel for AngularJS", - "version": "0.3.3", + "version": "0.3.4", "homepage": "http://revolunet.github.com/angular-carousel", "author": "Julien Bouquillon ", "repository": {