diff --git a/README.md b/README.md index 96e834e..9c49a06 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,7 @@ angular.module('MyApp', ['angular-carousel']); library](https://github.com/jeremyckahn/shifty/blob/master/src/shifty.formulas.js) (default=easeIn) - `rn-carousel-duration`: add this attribute to set the duration of the transition (default=300) - `rn-carousel-controls-allow-loop`: add this attribute to allow looping through slides from prev/next controls + - `rn-carousel-items-per-slide`: add this attribute to specify how many slides will slide on one click (used for multiple item slider) / default value "1" if not used ## Indicators diff --git a/dist/angular-carousel.css b/dist/angular-carousel.css index a11d852..8985d28 100755 --- a/dist/angular-carousel.css +++ b/dist/angular-carousel.css @@ -29,6 +29,12 @@ ul[rn-carousel] { height: 100%; display: inline-block; } +div.slides-per-click-demo ul[rn-carousel] { + width: 420px; + /* wrapper created a bit bigger to show that next slide is 'on its way' */ } + div.slides-per-click-demo ul[rn-carousel] > li { + width: 200px; } + /* prevent flickering when moving buffer */ ul[rn-carousel-buffered] > li { display: none; } @@ -43,6 +49,9 @@ div.rn-carousel-indicator span { div.rn-carousel-indicator span.active { color: white; } +div.demo-container > div { + position: relative; } + /* prev/next controls */ .rn-carousel-control { -webkit-transition: opacity 0.2s ease-out; @@ -62,3 +71,5 @@ div.rn-carousel-indicator span { right: 0.5em; } .rn-carousel-control.rn-carousel-control-next:before { content: ">"; } + +/*# sourceMappingURL=angular-carousel.css.map */ diff --git a/dist/angular-carousel.css.map b/dist/angular-carousel.css.map index 835dca7..8f53645 100644 --- a/dist/angular-carousel.css.map +++ b/dist/angular-carousel.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "AAAA,iBAAkB;EAChB,KAAK,EAAC,KAAK;;AAGb,eAAgB;EACd,QAAQ,EAAC,MAAM;EACf,OAAO,EAAC,CAAC;EACT,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,QAAQ;EAClB,WAAW,EAAC,MAAM;EAClB,gBAAgB,EAAE,KAAK;EACvB,YAAY,EAAE,KAAK;EACnB,oBAAK;IACH,KAAK,EAAC,KAAK;IACX,mBAAmB,EAAE,MAAM;IAC3B,QAAQ,EAAE,OAAO;IACjB,cAAc,EAAE,GAAG;IACnB,QAAQ,EAAC,QAAQ;IACjB,IAAI,EAAC,CAAC;IACN,KAAK,EAAC,CAAC;IACP,WAAW,EAAE,MAAM;IACnB,OAAO,EAAC,CAAC;IACT,MAAM,EAAC,CAAC;IACR,eAAe,EAAC,IAAI;IACpB,KAAK,EAAC,IAAI;IACV,MAAM,EAAC,IAAI;IACX,OAAO,EAAC,YAAY;;;AAKxB,6BAA8B;EAC5B,OAAO,EAAC,IAAI;;AAGd,oCAAqC;EACnC,QAAQ,EAAC,OAAO;;;AAIlB,8BAA+B;EAC7B,MAAM,EAAC,OAAO;EACd,KAAK,EAAE,IAAI;EACX,qCAAS;IACP,KAAK,EAAE,KAAK;;;AAKhB,oBAAqB;EACnB,UAAU,EAAE,qBAAqB;EACjC,SAAS,EAAE,IAAI;EACf,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,GAAG;EACR,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,OAAO;EACf,0BAAQ;IACN,OAAO,EAAE,CAAC;EAGZ,6CAA2B;IACzB,IAAI,EAAE,KAAK;IACX,oDAAS;MACP,OAAO,EAAE,GAAG;EAIhB,6CAA2B;IACzB,KAAK,EAAE,KAAK;IACZ,oDAAS;MACP,OAAO,EAAE,GAAG", +"mappings": "AAAA,iBAAkB;EAChB,KAAK,EAAC,KAAK;;AAGb,eAAgB;EACd,QAAQ,EAAC,MAAM;EACf,OAAO,EAAC,CAAC;EACT,WAAW,EAAE,MAAM;EACnB,QAAQ,EAAE,QAAQ;EAClB,WAAW,EAAC,MAAM;EAClB,gBAAgB,EAAE,KAAK;EACvB,YAAY,EAAE,KAAK;EACnB,oBAAK;IACH,KAAK,EAAC,KAAK;IACX,mBAAmB,EAAE,MAAM;IAC3B,QAAQ,EAAE,OAAO;IACjB,cAAc,EAAE,GAAG;IACnB,QAAQ,EAAC,QAAQ;IACjB,IAAI,EAAC,CAAC;IACN,KAAK,EAAC,CAAC;IACP,WAAW,EAAE,MAAM;IACnB,OAAO,EAAC,CAAC;IACT,MAAM,EAAC,CAAC;IACR,eAAe,EAAC,IAAI;IACpB,KAAK,EAAC,IAAI;IACV,MAAM,EAAC,IAAI;IACX,OAAO,EAAC,YAAY;;AAKtB,yCAAgB;EACd,KAAK,EAAE,KAAK;;EACZ,8CAAK;IACH,KAAK,EAAE,KAAK;;;AAMlB,6BAA8B;EAC5B,OAAO,EAAC,IAAI;;AAGd,oCAAqC;EACnC,QAAQ,EAAC,OAAO;;;AAIlB,8BAA+B;EAC7B,MAAM,EAAC,OAAO;EACd,KAAK,EAAE,IAAI;EACX,qCAAS;IACP,KAAK,EAAE,KAAK;;AAIhB,wBAAyB;EACvB,QAAQ,EAAE,QAAQ;;;AAIpB,oBAAqB;EACnB,UAAU,EAAE,qBAAqB;EACjC,SAAS,EAAE,IAAI;EACf,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,GAAG;EACR,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,OAAO;EACf,0BAAQ;IACN,OAAO,EAAE,CAAC;EAGZ,6CAA2B;IACzB,IAAI,EAAE,KAAK;IACX,oDAAS;MACP,OAAO,EAAE,GAAG;EAIhB,6CAA2B;IACzB,KAAK,EAAE,KAAK;IACZ,oDAAS;MACP,OAAO,EAAE,GAAG", "sources": ["../src/css/angular-carousel.scss"], "names": [], "file": "angular-carousel.css" diff --git a/dist/angular-carousel.js b/dist/angular-carousel.js index 58c9556..e4b90c6 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.13 - 2015-06-15 + * @version v0.3.13 - 2015-09-30 * @link http://revolunet.github.com/angular-carousel * @author Julien Bouquillon * @license MIT License, http://www.opensource.org/licenses/MIT @@ -292,7 +292,8 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach intialState = true, animating = false, mouseUpBound = false, - locked = false; + locked = false, + slidesPerClickLimit = parseInt(iAttributes.rnCarouselItemsPerSlide); //rn-swipe-disabled =true will only disable swipe events if(iAttributes.rnSwipeDisabled !== "true") { @@ -329,7 +330,12 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach } scope.nextSlide = function(slideOptions) { - var index = scope.carouselIndex + 1; + var index; + if(isNaN(slidesPerClickLimit) === false && currentSlides.length - scope.carouselIndex + slidesPerClickLimit >= slidesPerClickLimit && currentSlides.length/slidesPerClickLimit > 1) { + index = scope.carouselIndex + slidesPerClickLimit; + } else { + index = scope.carouselIndex + 1; + } if (index > currentSlides.length - 1) { index = 0; } @@ -339,7 +345,12 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach }; scope.prevSlide = function(slideOptions) { - var index = scope.carouselIndex - 1; + var index; + if(isNaN(slidesPerClickLimit) === false && currentSlides.length - scope.carouselIndex + slidesPerClickLimit >= slidesPerClickLimit && currentSlides.length/slidesPerClickLimit > 1) { + index = scope.carouselIndex - slidesPerClickLimit; + } else { + index = scope.carouselIndex - 1; + } if (index < 0) { index = currentSlides.length - 1; } @@ -453,8 +464,15 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach if (iAttributes.rnCarouselControls!==undefined) { // dont use a directive for this + var slidesCountInCurrent = isRepeatBased ? scope[repeatCollection.replace('::', '')].length : currentSlides.length; + var noneDividableCarouselItemCount = 1; + if(isNaN(slidesPerClickLimit) === false){ + noneDividableCarouselItemCount = (slidesCountInCurrent%slidesPerClickLimit !== 0 && slidesCountInCurrent/slidesPerClickLimit > 1) ? (slidesCountInCurrent%slidesPerClickLimit) : 1; + } else { + noneDividableCarouselItemCount = 1; + } var canloop = ((isRepeatBased ? scope[repeatCollection.replace('::', '')].length : currentSlides.length) > 1) ? angular.isDefined(tAttributes['rnCarouselControlsAllowLoop']) : false; - var nextSlideIndexCompareValue = isRepeatBased ? repeatCollection.replace('::', '') + '.length - 1' : currentSlides.length - 1; + var nextSlideIndexCompareValue = isRepeatBased ? repeatCollection.replace('::', '') + '.length - ' + noneDividableCarouselItemCount.toString() : currentSlides.length - 1; var tpl = '
\n' + ' \n' + ' \n' + diff --git a/dist/angular-carousel.min.css b/dist/angular-carousel.min.css index 0238d30..b9dcba2 100644 --- a/dist/angular-carousel.min.css +++ b/dist/angular-carousel.min.css @@ -1 +1 @@ -input[type=range]{width:300px}ul[rn-carousel]{overflow:hidden;padding:0;white-space:nowrap;position:relative;-webkit-perspective:1000px;-ms-perspective:1000px;perspective:1000px;-ms-touch-action:pan-y;touch-action:pan-y}ul[rn-carousel]>li{color:#000;-webkit-backface-visibility:hidden;-ms-backface-visibility:hidden;backface-visibility:hidden;overflow:visible;vertical-align:top;position:absolute;left:0;right:0;white-space:normal;padding:0;margin:0;list-style-type:none;width:100%;height:100%;display:inline-block}ul[rn-carousel-buffered]>li{display:none}ul[rn-carousel-transition=hexagon]{overflow:visible}div.rn-carousel-indicator span{cursor:pointer;color:#666}div.rn-carousel-indicator span.active{color:#fff}.rn-carousel-control{-webkit-transition:opacity .2s ease-out;transition:opacity .2s ease-out;font-size:2rem;position:absolute;top:40%;opacity:.75;cursor:pointer}.rn-carousel-control:hover{opacity:1}.rn-carousel-control.rn-carousel-control-prev{left:.5em}.rn-carousel-control.rn-carousel-control-prev:before{content:"<"}.rn-carousel-control.rn-carousel-control-next{right:.5em}.rn-carousel-control.rn-carousel-control-next:before{content:">"} \ No newline at end of file +input[type=range]{width:300px}ul[rn-carousel]{overflow:hidden;padding:0;white-space:nowrap;position:relative;-webkit-perspective:1000px;-ms-perspective:1000px;perspective:1000px;-ms-touch-action:pan-y;touch-action:pan-y}ul[rn-carousel]>li{color:#000;-webkit-backface-visibility:hidden;-ms-backface-visibility:hidden;backface-visibility:hidden;overflow:visible;vertical-align:top;position:absolute;left:0;right:0;white-space:normal;padding:0;margin:0;list-style-type:none;width:100%;height:100%;display:inline-block}div.slides-per-click-demo ul[rn-carousel]{width:420px}div.slides-per-click-demo ul[rn-carousel]>li{width:200px}ul[rn-carousel-buffered]>li{display:none}ul[rn-carousel-transition=hexagon]{overflow:visible}div.rn-carousel-indicator span{cursor:pointer;color:#666}div.rn-carousel-indicator span.active{color:#fff}div.demo-container>div{position:relative}.rn-carousel-control{-webkit-transition:opacity .2s ease-out;transition:opacity .2s ease-out;font-size:2rem;position:absolute;top:40%;opacity:.75;cursor:pointer}.rn-carousel-control:hover{opacity:1}.rn-carousel-control.rn-carousel-control-prev{left:.5em}.rn-carousel-control.rn-carousel-control-prev:before{content:"<"}.rn-carousel-control.rn-carousel-control-next{right:.5em}.rn-carousel-control.rn-carousel-control-next:before{content:">"} \ No newline at end of file diff --git a/dist/angular-carousel.min.js b/dist/angular-carousel.min.js index 28ebabe..4980a81 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.13 - 2015-06-15 + * @version v0.3.13 - 2015-09-30 * @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",["$interval",function(a){return{restrict:"A",link:function(b,c,d){var e=function(){b.autoSlider&&(a.cancel(b.autoSlider),b.autoSlider=null)},f=function(){b.autoSlide()};b.$watch("carouselIndex",f),d.hasOwnProperty("rnCarouselPauseOnHover")&&"false"!==d.rnCarouselPauseOnHover&&(c.on("mouseenter",e),c.on("mouseleave",f)),b.$on("$destroy",function(){e(),c.off("mouseenter",e),c.off("mouseleave",f)})}}}]),angular.module("angular-carousel").directive("rnCarouselIndicators",["$parse",function(a){return{restrict:"A",scope:{slides:"=",index:"=rnCarouselIndex"},templateUrl:"carousel-indicators.html",link:function(b,c,d){var e=a(d.rnCarouselIndex);b.goToSlide=function(a){e.assign(b.$parent.$parent,a)}}}}]),angular.module("angular-carousel").run(["$templateCache",function(a){a.put("carousel-indicators.html",'
\n●
')}]),function(){"use strict";angular.module("angular-carousel").service("DeviceCapabilities",function(){function a(){var a="transform",b="webkitTransform";return"undefined"!=typeof document.body.style[a]?["webkit","moz","o","ms"].every(function(b){var c="-"+b+"-transform";return"undefined"!=typeof document.body.style[c]?(a=c,!1):!0}):a="undefined"!=typeof document.body.style[b]?"-webkit-transform":void 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(a.transformProperty)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[a.transformProperty+"-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[a.transformProperty+"-origin"]="50% 50%",e=0,Math.abs(g)<100&&(e=.3+.7*i),f.opacity=e}else f[a.transformProperty]=h;else f["margin-left"]=g+"%";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){function k(a,b,c){var d=c;return a.every(function(a,c){return angular.equals(a,b)?(d=c,!1):!0}),d}{var l=0;b.requestAnimationFrame||b.webkitRequestAnimationFrame||b.mozRequestAnimationFrame}return{restrict:"A",scope:!0,compile:function(m,n){var o,p,q=m[0].querySelector("li"),r=q?q.attributes:[],s=!1,t=!1;return["ng-repeat","data-ng-repeat","ng:repeat","x-ng-repeat"].every(function(a){var b=r[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(o=c[1],p=c[2],o)return angular.isDefined(n.rnCarouselBuffered)&&(t=!0,b.value=o+" in "+p+"|carouselSlice:carouselBufferIndex:carouselBufferSize",d&&(b.value+=" track by "+d)),s=!0,!1}return!0}),function(m,o,q){function r(){return o[0].querySelectorAll("ul[rn-carousel] > li")}function u(a){N=!0,D({x:a.clientX,y:a.clientY},a)}function v(a){var b=100*m.carouselBufferIndex+a;angular.forEach(r(),function(a,c){a.style.cssText=i(h(c,b,K.transitionType))})}function w(a,b){if(void 0===a&&(a=m.carouselIndex),b=b||{},b.animate===!1||"none"===K.transitionType)return S=!1,M=-100*a,m.carouselIndex=a,E(),void 0;S=!0;var c=new j;c.tween({from:{x:M},to:{x:-100*a},duration:K.transitionDuration,easing:K.transitionEasing,step:function(a){v(a.x)},finish:function(){m.$apply(function(){m.carouselIndex=a,M=-100*a,E(),f(function(){S=!1},0,!1)})}})}function x(){var a=o[0].getBoundingClientRect();return a.width?a.width:a.right-a.left}function y(){P=x()}function z(){R||(R=!0,c.bind("mouseup",u))}function A(){R&&(R=!1,c.unbind("mouseup",u))}function B(a){return S||O.length<=1?void 0:(y(),Q=o[0].querySelector("li").getBoundingClientRect().left,G=!0,H=a.x,!1)}function C(a){var b,c;if(z(),G&&(b=a.x,c=H-b,c>2||-2>c)){N=!0;var d=M+100*-c/P;v(d)}return!1}function D(a,b){if((!b||N)&&(A(),G=!1,N=!1,I=H-a.x,0!==I&&!S))if(M+=100*-I/P,K.isSequential){var c=K.moveTreshold*P,e=-I,f=-Math[e>=0?"ceil":"floor"](e/P),g=Math.abs(e)>c;O&&f+m.carouselIndex>=O.length&&(f=O.length-1-m.carouselIndex),f+m.carouselIndex<0&&(f=-m.carouselIndex);var h=g?f:0;I=m.carouselIndex+h,w(I),void 0!==q.rnCarouselOnInfiniteScrollRight&&0===f&&0!==m.carouselIndex&&(d(q.rnCarouselOnInfiniteScrollRight)(m),w(0)),void 0!==q.rnCarouselOnInfiniteScrollLeft&&0===f&&0===m.carouselIndex&&0===h&&(d(q.rnCarouselOnInfiniteScrollLeft)(m),w(O.length))}else m.$apply(function(){m.carouselIndex=parseInt(-M/100,10),E()})}function E(){var a=0,b=(m.carouselBufferSize-1)/2;t?(a=m.carouselIndex<=b?0:O&&O.lengthO.length-m.carouselBufferSize?O.length-m.carouselBufferSize:m.carouselIndex-b,m.carouselBufferIndex=a,f(function(){v(M)},0,!1)):f(function(){v(M)},0,!1)}function F(){y(),w()}l++;var G,H,I,J={transitionType:q.rnCarouselTransition||"slide",transitionEasing:q.rnCarouselEasing||"easeTo",transitionDuration:parseInt(q.rnCarouselDuration,10)||300,isSequential:!0,autoSlideDuration:3,bufferSize:5,moveTreshold:.1,defaultIndex:0},K=angular.extend({},J),L=!1,M=0,N=!1,O=[],P=null,Q=null,R=!1,S=!1;"true"!==q.rnSwipeDisabled&&a.bind(o,{start:B,move:C,end:D,cancel:function(a){D({},a)}}),m.nextSlide=function(a){var b=m.carouselIndex+1;b>O.length-1&&(b=0),S||w(b,a)},m.prevSlide=function(a){var b=m.carouselIndex-1;0>b&&(b=O.length-1),w(b,a)};var T=!0;if(m.carouselIndex=0,s||(O=[],angular.forEach(r(),function(a,b){O.push({id:b})})),void 0!==q.rnCarouselControls){var U=(s?m[p.replace("::","")].length:O.length)>1?angular.isDefined(n.rnCarouselControlsAllowLoop):!1,V=s?p.replace("::","")+".length - 1":O.length-1,W='
\n \n \n
';o.parent().append(e(angular.element(W))(m))}if(void 0!==q.rnCarouselAutoSlide){var X=parseInt(q.rnCarouselAutoSlide,10)||K.autoSlideDuration;m.autoSlide=function(){m.autoSlider&&(g.cancel(m.autoSlider),m.autoSlider=null),m.autoSlider=g(function(){S||G||m.nextSlide()},1e3*X)}}if(q.rnCarouselDefaultIndex){var Y=d(q.rnCarouselDefaultIndex);K.defaultIndex=Y(m.$parent)||0}if(q.rnCarouselIndex){var Z=function(a){$.assign(m.$parent,a)},$=d(q.rnCarouselIndex);angular.isFunction($.assign)?(m.$watch("carouselIndex",function(a){Z(a)}),m.$parent.$watch($,function(a){void 0!==a&&null!==a&&(O&&O.length>0&&a>=O.length?(a=O.length-1,Z(a)):O&&0>a&&(a=0,Z(a)),S||w(a,{animate:!T}),T=!1)}),L=!0,K.defaultIndex&&w(K.defaultIndex,{animate:!T})):isNaN(q.rnCarouselIndex)||w(parseInt(q.rnCarouselIndex,10),{animate:!1})}else w(K.defaultIndex,{animate:!T}),T=!1;if(q.rnCarouselLocked&&m.$watch(q.rnCarouselLocked,function(a){S=a===!0?!0:!1}),s){var _=void 0!==q.rnCarouselDeepWatch;m[_?"$watch":"$watchCollection"](p,function(a,b){if(O=a,_&&angular.isArray(a)){var c=b[m.carouselIndex],d=k(a,c,m.carouselIndex);w(d,{animate:!1})}else w(m.carouselIndex,{animate:!1})},!0)}m.$on("$destroy",function(){A()}),m.carouselBufferIndex=0,m.carouselBufferSize=K.bufferSize;var ab=angular.element(b);ab.bind("orientationchange",F),ab.bind("resize",F),m.$on("$destroy",function(){A(),ab.unbind("orientationchange",F),ab.unbind("resize",F)})}}}}])}(),angular.module("angular-carousel.shifty",[]).factory("Tweenable",function(){return function(a){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,v=c-(s-t),a.isPlaying()&&!u?(a._scheduleId=k(a._timeoutHandler,p),h(a,"beforeTween"),f(t,d,e,g,c,b,i),h(a,"afterTween"),j(d,a._attachment,v)):u&&(j(g,a._attachment,v),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="undefined"!=typeof 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,v;return k.prototype.tween=function(a){return this._isTweening?this:(void 0===a&&this._configured||this.setConfig(a),this._timestamp=r(),this._start(this.get(),this._attachment),this.resume())},k.prototype.setConfig=function(a){a=a||{},this._configured=!0,this._attachment=a.attachment,this._pausedAtTime=null,this._scheduleId=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();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.seek=function(a){return this._timestamp=r()-a,this.isPlaying()||(this._isTweening=!0,this._isPaused=!1,i(this,this._timestamp,this._duration,this._currentState,this._originalState,this._targetState,this._easing,this._step,this._scheduleFunction),this._timeoutHandler(),this.pause()),this},k.prototype.stop=function(c){return this._isTweening=!1,this._isPaused=!1,this._timeoutHandler=b,(a.cancelAnimationFrame||a.webkitCancelAnimationFrame||a.oCancelAnimationFrame||a.msCancelAnimationFrame||a.mozCancelRequestAnimationFrame||a.clearTimeout)(this._scheduleId),c&&(d(this._currentState,this._targetState),h(this,"afterTweenEnd"),this._finish.call(this,this._currentState,this._attachment)),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}),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)}(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 +angular.module("angular-carousel",["ngTouch","angular-carousel.shifty"]),angular.module("angular-carousel").directive("rnCarouselAutoSlide",["$interval",function(a){return{restrict:"A",link:function(b,c,d){var e=function(){b.autoSlider&&(a.cancel(b.autoSlider),b.autoSlider=null)},f=function(){b.autoSlide()};b.$watch("carouselIndex",f),d.hasOwnProperty("rnCarouselPauseOnHover")&&"false"!==d.rnCarouselPauseOnHover&&(c.on("mouseenter",e),c.on("mouseleave",f)),b.$on("$destroy",function(){e(),c.off("mouseenter",e),c.off("mouseleave",f)})}}}]),angular.module("angular-carousel").directive("rnCarouselIndicators",["$parse",function(a){return{restrict:"A",scope:{slides:"=",index:"=rnCarouselIndex"},templateUrl:"carousel-indicators.html",link:function(b,c,d){var e=a(d.rnCarouselIndex);b.goToSlide=function(a){e.assign(b.$parent.$parent,a)}}}}]),angular.module("angular-carousel").run(["$templateCache",function(a){a.put("carousel-indicators.html",'
\n●
')}]),function(){"use strict";angular.module("angular-carousel").service("DeviceCapabilities",function(){function a(){var a="transform",b="webkitTransform";return"undefined"!=typeof document.body.style[a]?["webkit","moz","o","ms"].every(function(b){var c="-"+b+"-transform";return"undefined"!=typeof document.body.style[c]?(a=c,!1):!0}):a="undefined"!=typeof document.body.style[b]?"-webkit-transform":void 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(a.transformProperty)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[a.transformProperty+"-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[a.transformProperty+"-origin"]="50% 50%",e=0,Math.abs(g)<100&&(e=.3+.7*i),f.opacity=e}else f[a.transformProperty]=h;else f["margin-left"]=g+"%";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){function k(a,b,c){var d=c;return a.every(function(a,c){return angular.equals(a,b)?(d=c,!1):!0}),d}var l=0;b.requestAnimationFrame||b.webkitRequestAnimationFrame||b.mozRequestAnimationFrame;return{restrict:"A",scope:!0,compile:function(m,n){var o,p,q=m[0].querySelector("li"),r=q?q.attributes:[],s=!1,t=!1;return["ng-repeat","data-ng-repeat","ng:repeat","x-ng-repeat"].every(function(a){var b=r[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(o=c[1],p=c[2],o)return angular.isDefined(n.rnCarouselBuffered)&&(t=!0,b.value=o+" in "+p+"|carouselSlice:carouselBufferIndex:carouselBufferSize",d&&(b.value+=" track by "+d)),s=!0,!1}return!0}),function(m,o,q,r){function u(){return o[0].querySelectorAll("ul[rn-carousel] > li")}function v(a){O=!0,E({x:a.clientX,y:a.clientY},a)}function w(a){var b=100*m.carouselBufferIndex+a;angular.forEach(u(),function(a,c){a.style.cssText=i(h(c,b,L.transitionType))})}function x(a,b){if(void 0===a&&(a=m.carouselIndex),b=b||{},b.animate===!1||"none"===L.transitionType)return T=!1,N=-100*a,m.carouselIndex=a,void F();T=!0;var c=new j;c.tween({from:{x:N},to:{x:-100*a},duration:L.transitionDuration,easing:L.transitionEasing,step:function(a){w(a.x)},finish:function(){m.$apply(function(){m.carouselIndex=a,N=-100*a,F(),f(function(){T=!1},0,!1)})}})}function y(){var a=o[0].getBoundingClientRect();return a.width?a.width:a.right-a.left}function z(){Q=y()}function A(){S||(S=!0,c.bind("mouseup",v))}function B(){S&&(S=!1,c.unbind("mouseup",v))}function C(a,b){return T||P.length<=1?void 0:(z(),R=o[0].querySelector("li").getBoundingClientRect().left,H=!0,I=a.x,!1)}function D(a,b){var c,d;if(A(),H&&(c=a.x,d=I-c,d>2||-2>d)){O=!0;var e=N+100*-d/Q;w(e)}return!1}function E(a,b,c){if((!b||O)&&(B(),H=!1,O=!1,J=I-a.x,0!==J&&!T))if(N+=100*-J/Q,L.isSequential){var e=L.moveTreshold*Q,f=-J,g=-Math[f>=0?"ceil":"floor"](f/Q),h=Math.abs(f)>e;P&&g+m.carouselIndex>=P.length&&(g=P.length-1-m.carouselIndex),g+m.carouselIndex<0&&(g=-m.carouselIndex);var i=h?g:0;J=m.carouselIndex+i,x(J),void 0!==q.rnCarouselOnInfiniteScrollRight&&0===g&&0!==m.carouselIndex&&(d(q.rnCarouselOnInfiniteScrollRight)(m),x(0)),void 0!==q.rnCarouselOnInfiniteScrollLeft&&0===g&&0===m.carouselIndex&&0===i&&(d(q.rnCarouselOnInfiniteScrollLeft)(m),x(P.length))}else m.$apply(function(){m.carouselIndex=parseInt(-N/100,10),F()})}function F(){var a=0,b=(m.carouselBufferSize-1)/2;t?(a=m.carouselIndex<=b?0:P&&P.lengthP.length-m.carouselBufferSize?P.length-m.carouselBufferSize:m.carouselIndex-b,m.carouselBufferIndex=a,f(function(){w(N)},0,!1)):f(function(){w(N)},0,!1)}function G(){z(),x()}l++;var H,I,J,K={transitionType:q.rnCarouselTransition||"slide",transitionEasing:q.rnCarouselEasing||"easeTo",transitionDuration:parseInt(q.rnCarouselDuration,10)||300,isSequential:!0,autoSlideDuration:3,bufferSize:5,moveTreshold:.1,defaultIndex:0},L=angular.extend({},K),M=!1,N=0,O=!1,P=[],Q=null,R=null,S=!1,T=!1,U=parseInt(q.rnCarouselItemsPerSlide);"true"!==q.rnSwipeDisabled&&a.bind(o,{start:C,move:D,end:E,cancel:function(a){E({},a)}}),m.nextSlide=function(a){var b;b=isNaN(U)===!1&&P.length-m.carouselIndex+U>=U&&P.length/U>1?m.carouselIndex+U:m.carouselIndex+1,b>P.length-1&&(b=0),T||x(b,a)},m.prevSlide=function(a){var b;b=isNaN(U)===!1&&P.length-m.carouselIndex+U>=U&&P.length/U>1?m.carouselIndex-U:m.carouselIndex-1,0>b&&(b=P.length-1),x(b,a)};var V=!0;if(m.carouselIndex=0,s||(P=[],angular.forEach(u(),function(a,b){P.push({id:b})})),void 0!==q.rnCarouselControls){var W=s?m[p.replace("::","")].length:P.length,X=1;X=isNaN(U)===!1&&W%U!==0&&W/U>1?W%U:1;var Y=(s?m[p.replace("::","")].length:P.length)>1?angular.isDefined(n.rnCarouselControlsAllowLoop):!1,Z=s?p.replace("::","")+".length - "+X.toString():P.length-1,$='
\n \n \n
';o.parent().append(e(angular.element($))(m))}if(void 0!==q.rnCarouselAutoSlide){var _=parseInt(q.rnCarouselAutoSlide,10)||L.autoSlideDuration;m.autoSlide=function(){m.autoSlider&&(g.cancel(m.autoSlider),m.autoSlider=null),m.autoSlider=g(function(){T||H||m.nextSlide()},1e3*_)}}if(q.rnCarouselDefaultIndex){var aa=d(q.rnCarouselDefaultIndex);L.defaultIndex=aa(m.$parent)||0}if(q.rnCarouselIndex){var ba=function(a){ca.assign(m.$parent,a)},ca=d(q.rnCarouselIndex);angular.isFunction(ca.assign)?(m.$watch("carouselIndex",function(a){ba(a)}),m.$parent.$watch(ca,function(a,b){void 0!==a&&null!==a&&(P&&P.length>0&&a>=P.length?(a=P.length-1,ba(a)):P&&0>a&&(a=0,ba(a)),T||x(a,{animate:!V}),V=!1)}),M=!0,L.defaultIndex&&x(L.defaultIndex,{animate:!V})):isNaN(q.rnCarouselIndex)||x(parseInt(q.rnCarouselIndex,10),{animate:!1})}else x(L.defaultIndex,{animate:!V}),V=!1;if(q.rnCarouselLocked&&m.$watch(q.rnCarouselLocked,function(a,b){T=a===!0?!0:!1}),s){var da=void 0!==q.rnCarouselDeepWatch;m[da?"$watch":"$watchCollection"](p,function(a,b){if(P=a,da&&angular.isArray(a)){var c=b[m.carouselIndex],d=k(a,c,m.carouselIndex);x(d,{animate:!1})}else x(m.carouselIndex,{animate:!1})},!0)}m.$on("$destroy",function(){B()}),m.carouselBufferIndex=0,m.carouselBufferSize=L.bufferSize;var ea=angular.element(b);ea.bind("orientationchange",G),ea.bind("resize",G),m.$on("$destroy",function(){B(),ea.unbind("orientationchange",G),ea.unbind("resize",G)})}}}}])}(),angular.module("angular-carousel.shifty",[]).factory("Tweenable",function(){return function(a){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,v=c-(s-t),a.isPlaying()&&!u?(a._scheduleId=k(a._timeoutHandler,p),h(a,"beforeTween"),f(t,d,e,g,c,b,i),h(a,"afterTween"),j(d,a._attachment,v)):u&&(j(g,a._attachment,v),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="undefined"!=typeof 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,v;return k.prototype.tween=function(a){return this._isTweening?this:(void 0===a&&this._configured||this.setConfig(a),this._timestamp=r(),this._start(this.get(),this._attachment),this.resume())},k.prototype.setConfig=function(a){a=a||{},this._configured=!0,this._attachment=a.attachment,this._pausedAtTime=null,this._scheduleId=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();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.seek=function(a){return this._timestamp=r()-a,this.isPlaying()||(this._isTweening=!0,this._isPaused=!1,i(this,this._timestamp,this._duration,this._currentState,this._originalState,this._targetState,this._easing,this._step,this._scheduleFunction),this._timeoutHandler(),this.pause()),this},k.prototype.stop=function(c){return this._isTweening=!1,this._isPaused=!1,this._timeoutHandler=b,(a.cancelAnimationFrame||a.webkitCancelAnimationFrame||a.oCancelAnimationFrame||a.msCancelAnimationFrame||a.mozCancelRequestAnimationFrame||a.clearTimeout)(this._scheduleId),c&&(d(this._currentState,this._targetState),h(this,"afterTweenEnd"),this._finish.call(this,this._currentState,this._attachment)),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}),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((6*a-1)*(2*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,e){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)}(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/index.html b/index.html index 374104e..d0dd87f 100644 --- a/index.html +++ b/index.html @@ -19,7 +19,7 @@

AngularJS Touch Carousel

Swipe these demos with your mouse or finger
-
+

Buffered ngRepeat demo

A simple buffered ng-repeat with a custom template. @@ -37,6 +37,24 @@

Buffered ngRepeat demo

+
+
+

Buffered ngRepeat demo with Slides per click enabled

+
A simple buffered ng-repeat with a custom template. +
+ Swipe 50 slides with only 5 slides in the DOM. use builtin controls +
+
+ index : +
    +
  • +
    + #{{ slide.id }} +
    +
    • +
+
+

buffered ngRepeat with auto-slide(pause on hover) and builtin indicators

@@ -155,7 +173,7 @@

End to End Swiping


- +
  • @@ -245,7 +263,7 @@

    End to End Swiping

    $scope.slides6.push(getSlide($scope.slides6, 'people')); } } - + // End to End swiping // load 130 images in main javascript container var slideImages = []; @@ -265,25 +283,25 @@

    End to End Swiping

    $scope.totalimg = slideImages.length; $scope.galleryNumber = 1; console.log($scope.galleryNumber); - + function getImage(target) { var i = target.length , p = (($scope.galleryNumber-1)*$scope.setOfImagesToShow)+i; console.log("i=" + i + "--" + p); - + return slideImages[p]; } function addImages(target, qty) { - + for (var i=0; i < qty; i++) { addImage(target); } } - + function addImage(target) { target.push(getImage(target)); } - + $scope.slides7 = []; $scope.carouselIndex7 = 0; $scope.setOfImagesToShow = 3; @@ -321,7 +339,7 @@

    End to End Swiping

    addImages($scope.slides7, $scope.setOfImagesToShow); console.log("no images left"); } - + } }) diff --git a/src/css/angular-carousel.scss b/src/css/angular-carousel.scss index 905971f..23a11ca 100755 --- a/src/css/angular-carousel.scss +++ b/src/css/angular-carousel.scss @@ -28,6 +28,15 @@ ul[rn-carousel] { } } +div.slides-per-click-demo { + ul[rn-carousel] { + width: 420px; /* wrapper created a bit bigger to show that next slide is 'on its way' */ + > li { + width: 200px; + } + } +} + /* prevent flickering when moving buffer */ ul[rn-carousel-buffered] > li { display:none; @@ -46,6 +55,10 @@ div.rn-carousel-indicator span { } } +div.demo-container > div { + position: relative; +} + /* prev/next controls */ .rn-carousel-control { transition: opacity 0.2s ease-out; diff --git a/src/directives/rn-carousel.js b/src/directives/rn-carousel.js index c4e1e4b..3261ac3 100755 --- a/src/directives/rn-carousel.js +++ b/src/directives/rn-carousel.js @@ -213,7 +213,8 @@ intialState = true, animating = false, mouseUpBound = false, - locked = false; + locked = false, + slidesPerClickLimit = parseInt(iAttributes.rnCarouselItemsPerSlide); //rn-swipe-disabled =true will only disable swipe events if(iAttributes.rnSwipeDisabled !== "true") { @@ -250,7 +251,12 @@ } scope.nextSlide = function(slideOptions) { - var index = scope.carouselIndex + 1; + var index; + if(isNaN(slidesPerClickLimit) === false && currentSlides.length - scope.carouselIndex + slidesPerClickLimit >= slidesPerClickLimit && currentSlides.length/slidesPerClickLimit > 1) { + index = scope.carouselIndex + slidesPerClickLimit; + } else { + index = scope.carouselIndex + 1; + } if (index > currentSlides.length - 1) { index = 0; } @@ -260,7 +266,12 @@ }; scope.prevSlide = function(slideOptions) { - var index = scope.carouselIndex - 1; + var index; + if(isNaN(slidesPerClickLimit) === false && currentSlides.length - scope.carouselIndex + slidesPerClickLimit >= slidesPerClickLimit && currentSlides.length/slidesPerClickLimit > 1) { + index = scope.carouselIndex - slidesPerClickLimit; + } else { + index = scope.carouselIndex - 1; + } if (index < 0) { index = currentSlides.length - 1; } @@ -374,8 +385,15 @@ if (iAttributes.rnCarouselControls!==undefined) { // dont use a directive for this + var slidesCountInCurrent = isRepeatBased ? scope[repeatCollection.replace('::', '')].length : currentSlides.length; + var noneDividableCarouselItemCount = 1; + if(isNaN(slidesPerClickLimit) === false){ + noneDividableCarouselItemCount = (slidesCountInCurrent%slidesPerClickLimit !== 0 && slidesCountInCurrent/slidesPerClickLimit > 1) ? (slidesCountInCurrent%slidesPerClickLimit) : 1; + } else { + noneDividableCarouselItemCount = 1; + } var canloop = ((isRepeatBased ? scope[repeatCollection.replace('::', '')].length : currentSlides.length) > 1) ? angular.isDefined(tAttributes['rnCarouselControlsAllowLoop']) : false; - var nextSlideIndexCompareValue = isRepeatBased ? repeatCollection.replace('::', '') + '.length - 1' : currentSlides.length - 1; + var nextSlideIndexCompareValue = isRepeatBased ? repeatCollection.replace('::', '') + '.length - ' + noneDividableCarouselItemCount.toString() : currentSlides.length - 1; var tpl = '
    \n' + ' \n' + ' \n' + diff --git a/test/unit/angular-carousel.js b/test/unit/angular-carousel.js index faea0e9..d231b68 100755 --- a/test/unit/angular-carousel.js +++ b/test/unit/angular-carousel.js @@ -40,7 +40,8 @@ describe('carousel', function () { useControl: false, useBuffer: false, nbItems: 25, - useWatch: false + useWatch: false, + useSlidesPerClick: 2 }; if (overrideOptions) angular.extend(options, overrideOptions); var sampleData = { @@ -61,6 +62,7 @@ describe('carousel', function () { if (options.useBuffer) tpl += ' rn-carousel-buffered '; if (options.useWatch) tpl += ' rn-carousel-watch '; if (options.useIndex) tpl += ' rn-carousel-index="' + options.useIndex + '" '; + if (options.useSlidesPerClick) tpl += ' rn-carousel-items-per-slide="' + options.useSlidesPerClick + '" '; tpl += '>
  • {{ item.text }}
'; angular.extend(scope, sampleData.scope); // var $element = $(tpl).appendTo($sandbox); @@ -573,7 +575,7 @@ describe('carousel', function () { expect(elm.find('li').last()[0].id).toBe('slide-' + scope.items[scope.items.length - 1].id); }); }); - + }); // describe('delayed collection and index', function () { // it('should follow multiple moves and buffer accordingly', function() {