From 755d3c7316c3c16d5f78c8e4f805bf4f9209c7ef Mon Sep 17 00:00:00 2001 From: Julien Bouquillon Date: Mon, 13 Oct 2014 04:52:02 +0200 Subject: [PATCH] refactor(carousel): transitions refactor : - single slide based transitions - externalize some services - use shifty.js for transitions - fix bunch of issues --- README.md | 39 +- TODO | 38 - bower.json | 2 +- demo/demo.css | 120 +- dist/angular-carousel.css | 97 +- dist/angular-carousel.js | 2298 +++++++++++++++++----- dist/angular-carousel.min.css | 2 +- dist/angular-carousel.min.js | 4 +- index.html | 267 +-- package.json | 2 +- src/angular-carousel.js | 3 +- src/css/angular-carousel.scss | 103 +- src/directives/rn-carousel-controls.js | 30 - src/directives/rn-carousel-indicators.js | 19 +- src/directives/rn-carousel.js | 866 ++++---- src/directives/shifty.js | 1383 +++++++++++++ 16 files changed, 3943 insertions(+), 1330 deletions(-) delete mode 100644 TODO delete mode 100755 src/directives/rn-carousel-controls.js create mode 100644 src/directives/shifty.js diff --git a/README.md b/README.md index f42df8e..c1b1af1 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ Comments and contributions welcome :) Proudly brought to you by the [@revolunet](http://twitter.com/revolunet) team. -**NOTE :** if you use IE<=9, iOS<7 or Android<4 please include the [requestAnimationFrame polyfill](https://github.com/darius/requestAnimationFrame/blob/master/requestAnimationFrame.js) in your application. ## Usage : @@ -28,7 +27,7 @@ angular.module('MyApp', ['angular-carousel']); - Add a `rn-carousel` attribute to your ` ``` +## Directive options : + - `rn-carousel-index` two way binding to control the carousel position (0-indexed) + - `rn-carousel-buffered` add this attribute to enable the carousel buffering, good to minimize the DOM (5 slides) + - `rn-carousel-controls` add this attribute to enable builtin prev/next buttons (you can override by CSS) + - `rn-carousel-auto-slide` add this attribute to make the carousel slide automatically after given seconds (default=3) + - `rn-carousel-transition` : transition type, can be one of `slide,zoom,hexagon,none,slideAndFade`. (default=slide) +## Indicators -## Features : - - Mobile friendly, tested on webkit+firefox - - Use CSS 3D transformations and `requestAnimationFrame`. (fallback to CSS 2D if 3D support not available) - - DOM buffering - - Index data-binding - - Optional indicators +You can add position indicators by adding this directive where you want : +```html +
+``` + - `slides` is the same collection you use in the carousel ng-repeat + - `carouselIndex` is the same index you've defined for the carousel -### Regular carousel : - - `rn-carousel-index` two way binding to control the carousel position. - - `rn-carousel-indicator` boolean value to enable the indicator, see demo page. - - `rn-carousel-buffered` boolean value to enable the carousel buffering, good to minimize the DOM, defaults to 5 slides. (works only with arrays) - - `rn-carousel-swipe` boolean value to enable/disable swiping (default true) - - `rn-carousel-control` boolean value to enable builtin prev/next buttons (you can override by CSS) - - `rn-carousel-auto-slide` integer value will make the slider automatically change the visible slide after given seconds - - `rn-carousel-pause-on-hover="true"` prevent auto-slide on hover - - `rn-carousel-prevent-animation="true"` if you dont want animations +## Notes : + - if you use IE<=9, iOS<7 or Android<4 please include the [requestAnimationFrame polyfill](https://github.com/darius/requestAnimationFrame/blob/master/requestAnimationFrame.js) in your application. + - don't set any style attribute to your li's. they would be overwritten by the carousel (use classes instead). + - angular-carousel use the great [shifty.js](https://github.com/jeremyckahn/shifty) for the animations ## Todo : - - see the [TODO file](./TODO) + - customisable transitions + - more transition types + - infinite loop support ## Contributing - Please follow [AngularJS GIT conventions](https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#) diff --git a/TODO b/TODO deleted file mode 100644 index e95331f..0000000 --- a/TODO +++ /dev/null @@ -1,38 +0,0 @@ - - -Carousel v2: - Base features: - ✔ basic ngRepeat @done (14-01-04 20:22) - ✔ ngRepeat with filter @done (14-01-04 20:54) - ✔ ngRepeat with filter and track by @done (14-01-04 20:59) - ✔ template based only @done (14-01-04 20:22) - Bindings: - ✔ should have a carousel-index binding @done (14-01-04 20:22) - Buffering: - ✔ should optionnaly buffer the carousel DOM @done (14-01-04 20:22) - Indicators: - ✔ should have optional indicators @done (14-01-05 01:56) - ✔ indicators should be clickable @done (14-01-05 01:56) - ☐ indicators should be customizable - Animations: - ☐ should have some builtin animations - ☐ should be able to customise animations - ☐ animation should occur on individual slides instead of container - ☐ use % instead of pixels - Bugs: - ✔ bug when rn-carousel-index change while animation from outside @done (14-01-05 02:19) - ☐ handle touch cancel - ✔ initial index position not respected @done (14-01-07 23:51) - Advanced: - ☐ optional loop - ☐ infinite carousels with slide generators (prev/next+load) - ✔ optional auto-slide @done (14-07-24 23:35) - Tests: - ✔ setup karma @done (14-01-05 00:15) - Tooling: - ✔ update grunt @done (14-01-04 22:09) - ✔ add autoprefixer @done (14-01-04 22:09) - ☐ template with code samples for the demo page - ☐ automate version bump - Docs: - ✔ README update @done (14-01-05 02:19) diff --git a/bower.json b/bower.json index ed277db..0215d2e 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.2.5", + "version": "0.3.0", "homepage": "http://revolunet.github.com/angular-carousel", "author": "Julien Bouquillon ", "repository": { diff --git a/demo/demo.css b/demo/demo.css index 16cb5a4..58c3766 100644 --- a/demo/demo.css +++ b/demo/demo.css @@ -22,110 +22,42 @@ h3 { font-size:30px; margin: 30px 0 10px 0; } -.my-slider { - width: 450px; - height: 300px; - font-size:0; -} -.my-slider li { - box-sizing: border-box; - font-size:30px; - position:relative; + +.center { + text-align: center; } -.my-slider li div.debug { - box-sizing: border-box; - position:absolute; - bottom:0; - height:50px; - background:rgba(0,0,0,0.7); +.bgimage { + text-align:right; color:white; - font-size:12px; - width:100%; - padding:5px; + background-size:cover; + height: 100%; } -.my-slider.standard li { - text-align:center; - padding:20px; - font-size:20px; + +ul[rn-carousel] { + width:400px; + height:200px; + margin: 0 auto; } -.big { - margin-top:30px; + +.carousel5 li { width:100%; + height:100%; font-size:30px; + background-color: #ccc; } -.controls { - margin-top:5px; - width:450px; + +div.carousel-demo { + margin-top:20px; + display:inline-block; text-align: center; } -.ng-cloak { - display:none; -} -.center { - text-align:center; -} -.thumbs { - width:450px; + +input.tiny { + width:50px; text-align:center; } -.thumb { - display: inline-block; - background-size:cover; - border:1px solid transparent; - margin:2px 4px; - width:60px; - height:40px; - transition: border 0.2s ease-in; -} -.is-active { - border:1px solid red; -} -.details { - color:white; - font-size:12px; - margin-bottom:10px; -} -.button{ - display: inline-block; - text-decoration: none; - font: bold 12px/12px HelveticaNeue, Arial; - padding: 8px 11px; - color: #555; - border: 1px solid #dedede; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - cursor:pointer; -} -.button:disabled { - cursor: default !important; - color: #aaa !important; -} -.button.grey{ - background: #bdbdbd; - background: -webkit-gradient(linear, left top, left bottom, from(#cacaca), to(#aeaeae)); /* WebKit */ - background: -moz-linear-gradient(top, #cacaca, #aeaeae); - border-color: #b5b5b5 #a1a1a1 #8f8f8f; - color: #555; - text-shadow: 0 1px 0 #d4d4d4; -} -.button.grey:hover{ - background: #c2c2c2; - background: -webkit-gradient(linear, left top, left bottom, from(#bcbcbc), to(#c2c2c2)); /* WebKit */ - background: -moz-linear-gradient(top, #bcbcbc, #c2c2c2); - border-color: #989898 #8e8e8e #878787; - text-shadow: 0 1px 0 #dadada; -} -/* override default controls */ -.rn-carousel-control { - font-size:50px !important; - color:white; - opacity: 1; -} -.rn-carousel-control.rn-carousel-control-prev { - left: 5px; -} -.rn-carousel-control.rn-carousel-control-next { - right: 5px; + +ul[rn-carousel-transition="hexagon"] { + margin-left:100px; } diff --git a/dist/angular-carousel.css b/dist/angular-carousel.css index 9461d9e..80c3978 100755 --- a/dist/angular-carousel.css +++ b/dist/angular-carousel.css @@ -1,73 +1,58 @@ -/* variables */ -/* general */ -.rn-carousel-container { +body { + background: #ccc; } + +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: none; touch-action: none; } + ul[rn-carousel] li { + color: black; + -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; } -.rn-carousel-slides { - -webkit-transform: translate3d(0, 0, 0); - -ms-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); - position: relative; - white-space: nowrap; - overflow: visible; - padding: 0; - margin: 0; } +/* prevent flickering when moving buffer */ +ul[rn-carousel-buffered] li { + display: none; } -/* IE 9 */ -:root .rn-carousel-slides { - -webkit-transform: translate(0, 0); - -ms-transform: translate(0, 0); - transform: translate(0, 0); - position: relative; - white-space: nowrap; - overflow: visible; - padding: 0; - margin: 0; } - -.rn-carousel-slide { - white-space: normal; - vertical-align: top; - display: inline-block; - width: 100%; - height: 100%; - -webkit-backface-visibility: hidden; - -ms-backface-visibility: hidden; - backface-visibility: hidden; } +ul[rn-carousel-transition="hexagon"] { + overflow: visible; } /* indicators */ -.rn-carousel-indicator { - width: 100%; - text-align: center; - height: 20px; - background-color: black; - background-color: rgba(0, 0, 0, 0.6); - position: relative; - bottom: 0; - cursor: pointer; } - .rn-carousel-indicator span { - -webkit-transition: color .2s ease-out; - transition: color .2s ease-out; - padding: 0 5px; - color: #333; } - .rn-carousel-indicator span:before { - content: "\25cf"; } - .rn-carousel-indicator span.ng-leave { - -webkit-transition: none !important; - transition: none !important; } - .rn-carousel-indicator .active { +div[rn-carousel-indicators] span { + cursor: pointer; + color: #666; } + div[rn-carousel-indicators] span.active { color: white; } -/* controls */ +/* prev/next controls */ .rn-carousel-control { -webkit-transition: opacity 0.2s ease-out; transition: opacity 0.2s ease-out; - font-size: 30px; + font-size: 2rem; position: absolute; - top: 50%; - margin-top: -35px; + top: 40%; opacity: 0.75; cursor: pointer; } .rn-carousel-control:hover { diff --git a/dist/angular-carousel.js b/dist/angular-carousel.js index 1bc9173..f08e401 100755 --- a/dist/angular-carousel.js +++ b/dist/angular-carousel.js @@ -1,6 +1,6 @@ /** * Angular Carousel - Mobile friendly touch carousel for AngularJS - * @version v0.2.4 - 2014-07-25 + * @version v0.3.0 - 2014-10-13 * @link http://revolunet.github.com/angular-carousel * @author Julien Bouquillon * @license MIT License, http://www.opensource.org/licenses/MIT @@ -14,7 +14,8 @@ http://github.com/revolunet/angular-carousel */ angular.module('angular-carousel', [ - 'ngTouch' + 'ngTouch', + 'angular-carousel.shifty' ]); angular.module('angular-carousel') @@ -72,52 +73,27 @@ angular.module('angular-carousel') }]); angular.module('angular-carousel') -.directive('rnCarouselControls', [function() { +.directive('rnCarouselIndicators', ['$parse', function($parse) { return { restrict: 'A', - replace: true, scope: { - items: '=', - index: '=' + slides: '=', + index: '=rnCarouselIndex' }, - link: function(scope, element, attrs) { - scope.prev = function() { - if (scope.index > 0) scope.index--; + templateUrl: 'carousel-indicators.html', + link: function(scope, iElement, iAttributes) { + var indexModel = $parse(iAttributes.rnCarouselIndex); + scope.goToSlide = function(index) { + indexModel.assign(scope.$parent.$parent, index); }; - scope.next = function() { - if (scope.index < scope.items.length-1) scope.index++; - }; - }, - templateUrl: 'carousel-controls.html' - }; -}]); - -angular.module('angular-carousel').run(['$templateCache', function($templateCache) { - $templateCache.put('carousel-controls.html', - '
\n' + - ' \n' + - ' \n' + - '
' - ); -}]); -angular.module('angular-carousel') - -.directive('rnCarouselIndicators', [function() { - return { - restrict: 'A', - replace: true, - scope: { - items: '=', - index: '=' - }, - templateUrl: 'carousel-indicators.html' + } }; }]); angular.module('angular-carousel').run(['$templateCache', function($templateCache) { $templateCache.put('carousel-indicators.html', - '
\n' + - ' \n' + + '
\n' + + '●' + '
' ); }]); @@ -127,460 +103,1894 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach angular.module('angular-carousel') - .directive('rnCarousel', ['$swipe', '$window', '$document', '$parse', '$compile', '$rootScope', function($swipe, $window, $document, $parse, $compile, $rootScope) { - // internal ids to allow multiple instances - var carouselId = 0, - // used to compute the sliding speed - timeConstant = 75, - // in container % how much we need to drag to trigger the slide change - moveTreshold = 0.05, - // in absolute pixels, at which distance the slide stick to the edge on release - rubberTreshold = 3; + .service('DeviceCapabilities', function() { + + // detect supported CSS property + function detectTransformProperty() { + var transformProperty = 'transform'; + ['webkit', 'moz', 'o', 'ms'].every(function(prefix) { + var e = '-' + prefix + '-transform'; + if (typeof document.body.style[e] !== 'undefined') { + transformProperty = e; + return false; + } + return true; + }); + return transformProperty; + } - var requestAnimationFrame = $window.requestAnimationFrame || $window.webkitRequestAnimationFrame || $window.mozRequestAnimationFrame; + //Detect support of translate3d + function detect3dSupport() { + var el = document.createElement('p'), + has3d, + transforms = { + 'webkitTransform': '-webkit-transform', + 'msTransform': '-ms-transform', + 'transform': 'transform' + }; + // Add it to the body to get the computed style + document.body.insertBefore(el, null); + for (var t in transforms) { + if (el.style[t] !== undefined) { + el.style[t] = 'translate3d(1px,1px,1px)'; + has3d = window.getComputedStyle(el).getPropertyValue(transforms[t]); + } + } + document.body.removeChild(el); + return (has3d !== undefined && has3d.length > 0 && has3d !== "none"); + } return { - restrict: 'A', - scope: true, - compile: function(tElement, tAttributes) { - // use the compile phase to customize the DOM - var firstChildAttributes = tElement.children()[0].attributes, - isRepeatBased = false, - isBuffered = false, - slidesCount = 0, - isIndexBound = false, - repeatItem, - repeatCollection; - - // add CSS classes - tElement.addClass('rn-carousel-slides'); - tElement.children().addClass('rn-carousel-slide'); - - // try to find an ngRepeat expression - // at this point, the attributes are not yet normalized so we need to try various syntax - ['ng-repeat', 'data-ng-repeat', 'x-ng-repeat'].every(function(attr) { - var repeatAttribute = firstChildAttributes[attr]; - if (angular.isDefined(repeatAttribute)) { - // ngRepeat regexp extracted from angular 1.2.7 src - var exprMatch = repeatAttribute.value.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/), - trackProperty = exprMatch[3]; - - repeatItem = exprMatch[1]; - repeatCollection = exprMatch[2]; - - if (repeatItem) { - if (angular.isDefined(tAttributes['rnCarouselBuffered'])) { - // update the current ngRepeat expression and add a slice operator if buffered - isBuffered = true; - repeatAttribute.value = repeatItem + ' in ' + repeatCollection + '|carouselSlice:carouselBufferIndex:carouselBufferSize'; - if (trackProperty) { - repeatAttribute.value += ' track by ' + trackProperty; + has3d: detect3dSupport(), + transformProperty: detectTransformProperty() + }; + + }) + + .service('computeCarouselSlideStyle', function(DeviceCapabilities) { + // compute transition transform properties for a given slide and global offset + return function(slideIndex, offset, transitionType) { + var style = { + display: 'inline-block' + }, + opacity, + absoluteLeft = (slideIndex * 100) + offset, + slideTransformValue = DeviceCapabilities.has3d ? 'translate3d(' + absoluteLeft + '%, 0, 0)' : 'translate3d(' + absoluteLeft + '%, 0)', + distance = ((100 - Math.abs(absoluteLeft)) / 100); + + if (transitionType == 'fadeAndSlide') { + style[DeviceCapabilities.transformProperty] = slideTransformValue; + opacity = 0; + if (Math.abs(absoluteLeft) < 100) { + opacity = 0.3 + distance * 0.7; + } + style.opacity = opacity; + } else if (transitionType == 'hexagon') { + var transformFrom = 100, + degrees = 0, + maxDegrees = 60 * (distance - 1); + + transformFrom = offset < (slideIndex * -100) ? 100 : 0; + degrees = offset < (slideIndex * -100) ? maxDegrees : -maxDegrees; + style[DeviceCapabilities.transformProperty] = slideTransformValue + ' ' + 'rotateY(' + degrees + 'deg)'; + style['transform-origin'] = transformFrom + '% 50%'; + } else if (transitionType == 'zoom') { + style[DeviceCapabilities.transformProperty] = slideTransformValue; + var scale = 1; + if (Math.abs(absoluteLeft) < 100) { + scale = 1 + ((1 - distance) * 2); + } + style[DeviceCapabilities.transformProperty] += ' scale(' + scale + ')'; + style['transform-origin'] = '50% 50%'; + opacity = 0; + if (Math.abs(absoluteLeft) < 100) { + opacity = 0.3 + distance * 0.7; + } + style.opacity = opacity; + } else { + style[DeviceCapabilities.transformProperty] = slideTransformValue; + } + return style; + }; + }) + + .service('createStyleString', function() { + return function(object) { + var styles = []; + angular.forEach(object, function(value, key) { + styles.push(key + ':' + value); + }); + return styles.join(';'); + }; + }) + + .directive('rnCarousel', ['$swipe', '$window', '$document', '$parse', '$compile', '$timeout', '$interval', 'computeCarouselSlideStyle', 'createStyleString', 'Tweenable', + function($swipe, $window, $document, $parse, $compile, $timeout, $interval, computeCarouselSlideStyle, createStyleString, Tweenable) { + // internal ids to allow multiple instances + var carouselId = 0, + // in container % how much we need to drag to trigger the slide change + moveTreshold = 0.05, + // in absolute pixels, at which distance the slide stick to the edge on release + rubberTreshold = 3; + + var requestAnimationFrame = $window.requestAnimationFrame || $window.webkitRequestAnimationFrame || $window.mozRequestAnimationFrame; + + return { + restrict: 'A', + scope: true, + compile: function(tElement, tAttributes) { + // use the compile phase to customize the DOM + var firstChildAttributes = tElement[0].querySelector('li').attributes, + isRepeatBased = false, + isBuffered = false, + repeatItem, + repeatCollection; + + // try to find an ngRepeat expression + // at this point, the attributes are not yet normalized so we need to try various syntax + ['ng-repeat', 'data-ng-repeat', 'ng:repeat', 'x-ng-repeat'].every(function(attr) { + var repeatAttribute = firstChildAttributes[attr]; + if (angular.isDefined(repeatAttribute)) { + // ngRepeat regexp extracted from angular 1.2.7 src + var exprMatch = repeatAttribute.value.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?\s*$/), + trackProperty = exprMatch[3]; + + repeatItem = exprMatch[1]; + repeatCollection = exprMatch[2]; + + if (repeatItem) { + if (angular.isDefined(tAttributes['rnCarouselBuffered'])) { + // update the current ngRepeat expression and add a slice operator if buffered + isBuffered = true; + repeatAttribute.value = repeatItem + ' in ' + repeatCollection + '|carouselSlice:carouselBufferIndex:carouselBufferSize'; + if (trackProperty) { + repeatAttribute.value += ' track by ' + trackProperty; + } } + isRepeatBased = true; + return false; } - isRepeatBased = true; - return false; } - } - return true; - }); - - return function(scope, iElement, iAttributes, containerCtrl) { - - carouselId++; - - var containerWidth, - transformProperty, - pressed, - startX, - amplitude, - offset = 0, - destination, - slidesCount = 0, - swipeMoved = false, - animOnIndexChange = true, - // javascript based animation easing - timestamp; - - // add a wrapper div that will hide the overflow - var carousel = iElement.wrap(""), - container = carousel.parent(); - - // if indicator or controls, setup the watch - if (angular.isDefined(iAttributes.rnCarouselIndicator) || angular.isDefined(iAttributes.rnCarouselControl)) { - updateIndicatorArray(); - scope.$watch('carouselIndex', function(newValue) { - scope.indicatorIndex = newValue; - scope.carouselExposedIndex = newValue; - }); - scope.$watch('indicatorIndex', function(newValue) { - goToSlide(newValue, true); - }); + return true; + }); - } + return function(scope, iElement, iAttributes, containerCtrl) { - if (angular.isDefined(iAttributes.rnCarouselPreventAnimation)) { - animOnIndexChange = false; - } + carouselId++; - scope.$watch('carouselExposedIndex', function(newValue) { - goToSlide(newValue, true); - }); - - // enable carousel indicator - if (angular.isDefined(iAttributes.rnCarouselIndicator)) { - var indicator = $compile("")(scope); - container.append(indicator); - } - - // enable carousel controls - if (angular.isDefined(iAttributes.rnCarouselControl)) { - var controls = $compile("")(scope); - container.append(controls); - } - - scope.carouselBufferIndex = 0; - scope.carouselBufferSize = 5; - scope.carouselIndex = 0; - - // handle index databinding - if (iAttributes.rnCarouselIndex) { - var updateParentIndex = function(value) { - indexModel.assign(scope.$parent, value); + var defaultOptions = { + transitionType: iAttributes.rnCarouselTransition || 'slide', + transitionEasing: 'easeTo', + transitionDuration: 300, + /* do touchend trigger next slide automatically */ + isSequential: true, + autoSlideDuration: 3, + bufferSize: 5 }; - var indexModel = $parse(iAttributes.rnCarouselIndex); - if (angular.isFunction(indexModel.assign)) { - /* check if this property is assignable then watch it */ - scope.$watch('carouselIndex', function(newValue) { - updateParentIndex(newValue); - }); - scope.carouselIndex = indexModel(scope); - scope.$parent.$watch(indexModel, function(newValue, oldValue) { - if (newValue!==undefined) { - if (newValue >= slidesCount) { - newValue = slidesCount - 1; - updateParentIndex(newValue); - } else if (newValue < 0) { - newValue = 0; - updateParentIndex(newValue); - } - goToSlide(newValue, animOnIndexChange); - } - }); - isIndexBound = true; - } else if (!isNaN(iAttributes.rnCarouselIndex)) { - /* if user just set an initial number, set it */ - scope.carouselIndex = parseInt(iAttributes.rnCarouselIndex, 10); + + // TODO + var options = angular.extend({}, defaultOptions); + + var pressed, + startX, + isIndexBound = false, + offset = 0, + destination, + swipeMoved = false, + //animOnIndexChange = true, + currentSlides, + elWidth = null, + elX = null, + animateTransitions = true, + intialState = true, + animating = false; + + if(iAttributes.rnCarouselControls!==undefined) { + // dont use a directive for this + var tpl = '
\n' + + ' \n' + + ' \n' + + '
'; + iElement.append($compile(angular.element(tpl))(scope)); } - } - - // watch the given collection - if (isRepeatBased) { - scope.$watchCollection(repeatCollection, function(newValue, oldValue) { - slidesCount = 0; - if (angular.isArray(newValue)) { - slidesCount = newValue.length; - } else if (angular.isObject(newValue)) { - slidesCount = Object.keys(newValue).length; + + $swipe.bind(iElement, { + start: swipeStart, + move: swipeMove, + end: swipeEnd, + cancel: function(event) { + swipeEnd({}, event); } - updateIndicatorArray(); - if (!containerWidth) updateContainerWidth(); - goToSlide(scope.carouselIndex); }); - } else { - slidesCount = iElement.children().length; - updateIndicatorArray(); - updateContainerWidth(); - } - - function updateIndicatorArray() { - // generate an array to be used by the indicators - var items = []; - for (var i = 0; i < slidesCount; i++) items[i] = i; - scope.carouselIndicatorArray = items; - } - - function getCarouselWidth() { - // container.css('width', 'auto'); - var slides = carousel.children(); - if (slides.length === 0) { - containerWidth = carousel[0].getBoundingClientRect().width; - } else { - containerWidth = slides[0].getBoundingClientRect().width; - } - // console.log('getCarouselWidth', containerWidth); - return containerWidth; - } - - function updateContainerWidth() { - // force the carousel container width to match the first slide width - container.css('width', '100%'); - var width = getCarouselWidth(); - if (width) { - container.css('width', width + 'px'); + + function getSlidesDOM() { + return iElement[0].querySelectorAll('li'); } - } - function scroll(x) { - // use CSS 3D transform to move the carousel - if (isNaN(x)) { - x = scope.carouselIndex * containerWidth; + function documentMouseUpEvent(event) { + // in case we click outside the carousel, trigger a fake swipeEnd + swipeMoved = true; + swipeEnd({ + x: event.clientX, + y: event.clientY + }, event); } - offset = x; - var move = -Math.round(offset); - move += (scope.carouselBufferIndex * containerWidth); + function updateSlidesPosition(offset) { + // manually apply transformation to carousel childrens + // todo : optim : apply only to visible items + var style, x; + x = scope.carouselBufferIndex * 100 + offset; + angular.forEach(getSlidesDOM(), function(child, index) { + style = createStyleString(computeCarouselSlideStyle(index, x, options.transitionType)); + if (child.getAttribute('style') !== style) { + child.setAttribute('style', style); + } - if(!is3dAvailable) { - carousel[0].style[transformProperty] = 'translate(' + move + 'px, 0)'; - } else { - carousel[0].style[transformProperty] = 'translate3d(' + move + 'px, 0, 0)'; + }); } - } - - function autoScroll() { - // scroll smoothly to "destination" until we reach it - // using requestAnimationFrame - var elapsed, delta; - - if (amplitude) { - elapsed = Date.now() - timestamp; - delta = amplitude * Math.exp(-elapsed / timeConstant); - if (delta > rubberTreshold || delta < -rubberTreshold) { - scroll(destination - delta); - /* We are using raf.js, a requestAnimationFrame polyfill, so - this will work on IE9 */ - requestAnimationFrame(autoScroll); - } else { - goToSlide(destination / containerWidth); + + scope.nextSlide = function(slideOptions) { + if (carouselId===1) { + console.log('nextSlide, scope.carouselIndex', scope.carouselIndex); } - } - } - - function capIndex(idx) { - // ensure given index it inside bounds - return (idx >= slidesCount) ? slidesCount: (idx <= 0) ? 0 : idx; - } - - function updateBufferIndex() { - // update and cap te buffer index - var bufferIndex = 0; - var bufferEdgeSize = (scope.carouselBufferSize - 1) / 2; - if (isBuffered) { - if (scope.carouselIndex <= bufferEdgeSize) { - bufferIndex = 0; - } else if (slidesCount < scope.carouselBufferSize) { - bufferIndex = 0; - } else if (scope.carouselIndex > slidesCount - scope.carouselBufferSize) { - bufferIndex = slidesCount - scope.carouselBufferSize; - } else { - bufferIndex = scope.carouselIndex - bufferEdgeSize; + var index = scope.carouselIndex + 1; + if (index > currentSlides.length - 1) { + index = 0; } - } - scope.carouselBufferIndex = bufferIndex; - } + if (!animating) { + goToSlide(index, slideOptions); + } + }; - function goToSlide(i, animate) { - if (isNaN(i)) { - i = scope.carouselIndex; - } - if (animate) { - // simulate a swipe so we have the standard animation - // used when external binding index is updated or touch canceed - offset = (i * containerWidth); - swipeEnd(null, null, true); - return; - } - scope.carouselIndex = capIndex(i); - updateBufferIndex(); - // if outside of angular scope, trigger angular digest cycle - // use local digest only for perfs if no index bound - if ($rootScope.$$phase!=='$apply' && $rootScope.$$phase!=='$digest') { - if (isIndexBound) { - scope.$apply(); - } else { - scope.$digest(); + scope.prevSlide = function(slideOptions) { + var index = scope.carouselIndex - 1; + if (index < 0) { + index = currentSlides.length - 1; } - } - scroll(); - } - - function getAbsMoveTreshold() { - // return min pixels required to move a slide - return moveTreshold * containerWidth; - } - - function documentMouseUpEvent(event) { - // in case we click outside the carousel, trigger a fake swipeEnd - swipeMoved = true; - swipeEnd({ - x: event.clientX, - y: event.clientY - }, event); - } - - function capPosition(x) { - // limit position if start or end of slides - var position = x; - if (scope.carouselIndex===0) { - position = Math.max(-getAbsMoveTreshold(), position); - } else if (scope.carouselIndex===slidesCount-1) { - position = Math.min(((slidesCount-1)*containerWidth + getAbsMoveTreshold()), position); - } - return position; - } - - function swipeStart(coords, event) { - //console.log('swipeStart', coords, event); - $document.bind('mouseup', documentMouseUpEvent); - pressed = true; - startX = coords.x; - - amplitude = 0; - timestamp = Date.now(); - - return false; - } - - function swipeMove(coords, event) { - //console.log('swipeMove', coords, event); - var x, delta; - if (pressed) { - x = coords.x; - delta = startX - x; - if (delta > 2 || delta < -2) { - swipeMoved = true; - startX = x; - - /* We are using raf.js, a requestAnimationFrame polyfill, so - this will work on IE9 */ - requestAnimationFrame(function() { - scroll(capPosition(offset + delta)); - }); + goToSlide(index, slideOptions); + }; + + function goToSlide(index, slideOptions) { + if (carouselId===1) { + console.log('goToSlide', arguments, animating); + } + // move a to the given slide index + if (index === undefined) { + index = scope.carouselIndex; } + + slideOptions = slideOptions || {}; + if (slideOptions.animate === false || options.transitionType === 'none') { + animating = false; + offset = index * -100; + scope.carouselIndex = index; + updateBufferIndex(); + return; + } + + animating = true; + var tweenable = new Tweenable(); + tweenable.tween({ + from: { + 'x': offset + }, + to: { + 'x': index * -100 + }, + duration: options.transitionDuration, + easing: options.transitionEasing, + step: function(state) { + updateSlidesPosition(state.x); + }, + finish: function() { + animating = false; + scope.$apply(function() { + scope.carouselIndex = index; + offset = index * -100; + updateBufferIndex(); + }); + } + }); } - return false; - } - function swipeEnd(coords, event, forceAnimation) { - //console.log('swipeEnd', 'scope.carouselIndex', scope.carouselIndex); + function getContainerWidth() { + return iElement[0].getBoundingClientRect().width; + } - // Prevent clicks on buttons inside slider to trigger "swipeEnd" event on touchend/mouseup - if(event && !swipeMoved) { - return; + function updateContainerWidth() { + elWidth = getContainerWidth(); } - $document.unbind('mouseup', documentMouseUpEvent); - pressed = false; - swipeMoved = false; + function swipeStart(coords, event) { + // console.log('swipeStart', coords, event); + $document.bind('mouseup', documentMouseUpEvent); + updateContainerWidth(); + elX = iElement[0].querySelector('li').getBoundingClientRect().left; + pressed = true; + startX = coords.x; + return false; + } - destination = offset; + function swipeMove(coords, event) { + //console.log('swipeMove', coords, event); + var x, delta; + if (pressed) { + x = coords.x; + delta = startX - x; + if (delta > 2 || delta < -2) { + swipeMoved = true; + var moveOffset = offset + (-delta * 100 / elWidth); + updateSlidesPosition(moveOffset); + } + } + return false; + } - var minMove = getAbsMoveTreshold(), - currentOffset = (scope.carouselIndex * containerWidth), - absMove = currentOffset - destination, - slidesMove = -Math[absMove>=0?'ceil':'floor'](absMove / containerWidth), - shouldMove = Math.abs(absMove) > minMove; + var init = true; + scope.carouselIndex = 0; - if ((slidesMove + scope.carouselIndex) >= slidesCount ) { - slidesMove = slidesCount - 1 - scope.carouselIndex; + if (!isRepeatBased) { + // fake array when no ng-repeat + currentSlides = []; + angular.forEach(getSlidesDOM(), function(node, index) { + currentSlides.push({id: index}); + }); } - if ((slidesMove + scope.carouselIndex) < 0) { - slidesMove = -scope.carouselIndex; + + var autoSlider; + if (iAttributes.rnCarouselAutoSlide!==undefined) { + var duration = parseInt(iAttributes.rnCarouselAutoSlide, 10) || options.autoSlideDuration; + autoSlider = $interval(function() { + if (!animating && !pressed) { + scope.nextSlide(); + } + }, duration * 1000); } - var moveOffset = shouldMove?slidesMove:0; - destination = (moveOffset + scope.carouselIndex) * containerWidth; - amplitude = destination - offset; - timestamp = Date.now(); - if (forceAnimation) { - amplitude = offset - currentOffset; + if (iAttributes.rnCarouselIndex) { + var updateParentIndex = function(value) { + indexModel.assign(scope.$parent, value); + }; + var indexModel = $parse(iAttributes.rnCarouselIndex); + if (angular.isFunction(indexModel.assign)) { + /* check if this property is assignable then watch it */ + scope.$watch('carouselIndex', function(newValue) { + console.log('watch carouselIndex', newValue); + if (!animating) { + updateParentIndex(newValue); + } + + }); + scope.$parent.$watch(indexModel, function(newValue, oldValue) { + + if (newValue !== undefined && newValue !== null) { + if (currentSlides && newValue >= currentSlides.length) { + newValue = currentSlides.length - 1; + updateParentIndex(newValue); + } else if (currentSlides && newValue < 0) { + newValue = 0; + updateParentIndex(newValue); + } + if (!animating) { + goToSlide(newValue, { + animate: !init + }); + } + init = false; + } + }); + isIndexBound = true; + } else if (!isNaN(iAttributes.rnCarouselIndex)) { + /* if user just set an initial number, set it */ + goToSlide(parseInt(iAttributes.rnCarouselIndex, 10), { + animate: false + }); + } + } else { + goToSlide(0, { + animate: !init + }); + init = false; } - /* We are using raf.js, a requestAnimationFrame polyfill, so - this will work on IE9 */ - requestAnimationFrame(autoScroll); - - return false; - } - - iAttributes.$observe('rnCarouselSwipe', function(newValue, oldValue) { - // only bind swipe when it's not switched off - if(newValue !== 'false' && newValue !== 'off') { - $swipe.bind(carousel, { - start: swipeStart, - move: swipeMove, - end: swipeEnd, - cancel: function(event) { - swipeEnd({}, event); - } + + if (isRepeatBased) { + scope.$watchCollection(repeatCollection, function(newValue, oldValue) { + //console.log('repeatCollection', arguments); + currentSlides = newValue; + goToSlide(scope.carouselIndex); }); } else { - // unbind swipe when it's switched off - carousel.unbind(); + } - }); - // initialise first slide only if no binding - // if so, the binding will trigger the first init - if (!isIndexBound) { - goToSlide(scope.carouselIndex); - } - - // detect supported CSS property - transformProperty = 'transform'; - ['webkit', 'Moz', 'O', 'ms'].every(function (prefix) { - var e = prefix + 'Transform'; - if (typeof document.body.style[e] !== 'undefined') { - transformProperty = e; - return false; + function swipeEnd(coords, event, forceAnimation) { + // console.log('swipeEnd', 'scope.carouselIndex', scope.carouselIndex); + // Prevent clicks on buttons inside slider to trigger "swipeEnd" event on touchend/mouseup + if (event && !swipeMoved) { + return; + } + + $document.unbind('mouseup', documentMouseUpEvent); + pressed = false; + swipeMoved = false; + destination = startX - coords.x; + if (destination===0) { + return; + } + if (animating) { + return; + } + offset += (-destination * 100 / elWidth); + if (options.isSequential) { + var minMove = moveTreshold * elWidth, + absMove = -destination, + slidesMove = -Math[absMove >= 0 ? 'ceil' : 'floor'](absMove / elWidth), + shouldMove = Math.abs(absMove) > minMove; + + if (currentSlides && (slidesMove + scope.carouselIndex) >= currentSlides.length) { + slidesMove = currentSlides.length - 1 - scope.carouselIndex; + } + if ((slidesMove + scope.carouselIndex) < 0) { + slidesMove = -scope.carouselIndex; + } + var moveOffset = shouldMove ? slidesMove : 0; + + destination = (scope.carouselIndex + moveOffset); + + goToSlide(destination); + } else { + scope.$apply(function() { + scope.carouselIndex = parseInt(-offset / 100, 10); + updateBufferIndex(); + }); + + } + } - return true; - }); - //Detect support of translate3d - function detect3dSupport(){ - var el = document.createElement('p'), - has3d, - transforms = { - 'webkitTransform':'-webkit-transform', - 'msTransform':'-ms-transform', - 'transform':'transform' - }; - // Add it to the body to get the computed style - document.body.insertBefore(el, null); - for(var t in transforms){ - if( el.style[t] !== undefined ){ - el.style[t] = 'translate3d(1px,1px,1px)'; - has3d = window.getComputedStyle(el).getPropertyValue(transforms[t]); + scope.$on('$destroy', function() { + $document.unbind('mouseup', documentMouseUpEvent); + }); + + scope.carouselBufferIndex = 0; + scope.carouselBufferSize = options.bufferSize; + + function updateBufferIndex() { + // update and cap te buffer index + var bufferIndex = 0; + var bufferEdgeSize = (scope.carouselBufferSize - 1) / 2; + if (isBuffered) { + if (scope.carouselIndex <= bufferEdgeSize) { + // first buffer part + bufferIndex = 0; + } else if (currentSlides && currentSlides.length < scope.carouselBufferSize) { + // smaller than buffer + bufferIndex = 0; + } else if (currentSlides && scope.carouselIndex > currentSlides.length - scope.carouselBufferSize) { + // last buffer part + bufferIndex = currentSlides.length - scope.carouselBufferSize; + } else { + // compute buffer start + bufferIndex = scope.carouselIndex - bufferEdgeSize; + } + + scope.carouselBufferIndex = bufferIndex; + $timeout(function() { + updateSlidesPosition(offset); + }, 0, false); + } else { + $timeout(function() { + updateSlidesPosition(offset); + }, 0, false); } } - document.body.removeChild(el); - return (has3d !== undefined && has3d.length > 0 && has3d !== "none"); - } - - var is3dAvailable = detect3dSupport(); - - function onOrientationChange() { - updateContainerWidth(); - goToSlide(); - } - - // handle orientation change - var winEl = angular.element($window); - winEl.bind('orientationchange', onOrientationChange); - winEl.bind('resize', onOrientationChange); - - scope.$on('$destroy', function() { - $document.unbind('mouseup', documentMouseUpEvent); - winEl.unbind('orientationchange', onOrientationChange); - winEl.unbind('resize', onOrientationChange); - }); - }; + function onOrientationChange() { + updateContainerWidth(); + goToSlide(); + } + + // handle orientation change + var winEl = angular.element($window); + winEl.bind('orientationchange', onOrientationChange); + winEl.bind('resize', onOrientationChange); + + scope.$on('$destroy', function() { + $document.unbind('mouseup', documentMouseUpEvent); + winEl.unbind('orientationchange', onOrientationChange); + winEl.unbind('resize', onOrientationChange); + }); + }; + } + }; + } + ]); +})(); + + + +angular.module('angular-carousel.shifty', []) + +.factory('Tweenable', function() { + + (function (root) { + /*! + * Shifty Core + * By Jeremy Kahn - jeremyckahn@gmail.com + */ + + // UglifyJS define hack. Used for unit testing. Contents of this if are + // compiled away. + if (typeof SHIFTY_DEBUG_NOW === 'undefined') { + SHIFTY_DEBUG_NOW = function () { + return +new Date(); + }; + } + + var Tweenable = (function () { + + 'use strict'; + + // Aliases that get defined later in this function + var formula; + + // CONSTANTS + var DEFAULT_SCHEDULE_FUNCTION; + var DEFAULT_EASING = 'linear'; + var DEFAULT_DURATION = 500; + var UPDATE_TIME = 1000 / 60; + + var _now = Date.now + ? Date.now + : function () {return +new Date();}; + + var now = SHIFTY_DEBUG_NOW + ? SHIFTY_DEBUG_NOW + : _now; + + if (typeof window !== 'undefined') { + // requestAnimationFrame() shim by Paul Irish (modified for Shifty) + // http://paulirish.com/2011/requestanimationframe-for-smart-animating/ + DEFAULT_SCHEDULE_FUNCTION = window.requestAnimationFrame + || window.webkitRequestAnimationFrame + || window.oRequestAnimationFrame + || window.msRequestAnimationFrame + || (window.mozCancelRequestAnimationFrame + && window.mozRequestAnimationFrame) + || setTimeout; + } else { + DEFAULT_SCHEDULE_FUNCTION = setTimeout; + } + + function noop () { + // NOOP! + } + + /*! + * Handy shortcut for doing a for-in loop. This is not a "normal" each + * function, it is optimized for Shifty. The iterator function only receives + * the property name, not the value. + * @param {Object} obj + * @param {Function(string)} fn + */ + function each (obj, fn) { + var key; + for (key in obj) { + if (Object.hasOwnProperty.call(obj, key)) { + fn(key); + } + } + } + + /*! + * Perform a shallow copy of Object properties. + * @param {Object} targetObject The object to copy into + * @param {Object} srcObject The object to copy from + * @return {Object} A reference to the augmented `targetObj` Object + */ + function shallowCopy (targetObj, srcObj) { + each(srcObj, function (prop) { + targetObj[prop] = srcObj[prop]; + }); + + return targetObj; + } + + /*! + * Copies each property from src onto target, but only if the property to + * copy to target is undefined. + * @param {Object} target Missing properties in this Object are filled in + * @param {Object} src + */ + function defaults (target, src) { + each(src, function (prop) { + if (typeof target[prop] === 'undefined') { + target[prop] = src[prop]; + } + }); + } + + /*! + * Calculates the interpolated tween values of an Object for a given + * timestamp. + * @param {Number} forPosition The position to compute the state for. + * @param {Object} currentState Current state properties. + * @param {Object} originalState: The original state properties the Object is + * tweening from. + * @param {Object} targetState: The destination state properties the Object + * is tweening to. + * @param {number} duration: The length of the tween in milliseconds. + * @param {number} timestamp: The UNIX epoch time at which the tween began. + * @param {Object} easing: This Object's keys must correspond to the keys in + * targetState. + */ + function tweenProps (forPosition, currentState, originalState, targetState, + duration, timestamp, easing) { + var normalizedPosition = (forPosition - timestamp) / duration; + + var prop; + for (prop in currentState) { + if (currentState.hasOwnProperty(prop)) { + currentState[prop] = tweenProp(originalState[prop], + targetState[prop], formula[easing[prop]], normalizedPosition); + } + } + + return currentState; + } + + /*! + * Tweens a single property. + * @param {number} start The value that the tween started from. + * @param {number} end The value that the tween should end at. + * @param {Function} easingFunc The easing curve to apply to the tween. + * @param {number} position The normalized position (between 0.0 and 1.0) to + * calculate the midpoint of 'start' and 'end' against. + * @return {number} The tweened value. + */ + function tweenProp (start, end, easingFunc, position) { + return start + (end - start) * easingFunc(position); + } + + /*! + * Applies a filter to Tweenable instance. + * @param {Tweenable} tweenable The `Tweenable` instance to call the filter + * upon. + * @param {String} filterName The name of the filter to apply. + */ + function applyFilter (tweenable, filterName) { + var filters = Tweenable.prototype.filter; + var args = tweenable._filterArgs; + + each(filters, function (name) { + if (typeof filters[name][filterName] !== 'undefined') { + filters[name][filterName].apply(tweenable, args); + } + }); + } + + var timeoutHandler_endTime; + var timeoutHandler_currentTime; + var timeoutHandler_isEnded; + /*! + * Handles the update logic for one step of a tween. + * @param {Tweenable} tweenable + * @param {number} timestamp + * @param {number} duration + * @param {Object} currentState + * @param {Object} originalState + * @param {Object} targetState + * @param {Object} easing + * @param {Function} step + * @param {Function(Function,number)}} schedule + */ + function timeoutHandler (tweenable, timestamp, duration, currentState, + originalState, targetState, easing, step, schedule) { + timeoutHandler_endTime = timestamp + duration; + timeoutHandler_currentTime = Math.min(now(), timeoutHandler_endTime); + timeoutHandler_isEnded = timeoutHandler_currentTime >= timeoutHandler_endTime; + + if (tweenable.isPlaying() && !timeoutHandler_isEnded) { + schedule(tweenable._timeoutHandler, UPDATE_TIME); + + applyFilter(tweenable, 'beforeTween'); + tweenProps(timeoutHandler_currentTime, currentState, originalState, + targetState, duration, timestamp, easing); + applyFilter(tweenable, 'afterTween'); + + step(currentState); + } else if (timeoutHandler_isEnded) { + step(targetState); + tweenable.stop(true); + } + } + + + /*! + * Creates a usable easing Object from either a string or another easing + * Object. If `easing` is an Object, then this function clones it and fills + * in the missing properties with "linear". + * @param {Object} fromTweenParams + * @param {Object|string} easing + */ + function composeEasingObject (fromTweenParams, easing) { + var composedEasing = {}; + + if (typeof easing === 'string') { + each(fromTweenParams, function (prop) { + composedEasing[prop] = easing; + }); + } else { + each(fromTweenParams, function (prop) { + if (!composedEasing[prop]) { + composedEasing[prop] = easing[prop] || DEFAULT_EASING; } + }); + } + + return composedEasing; + } + + /** + * Tweenable constructor. + * @param {Object=} opt_initialState The values that the initial tween should start at if a "from" object is not provided to Tweenable#tween. + * @param {Object=} opt_config See Tweenable.prototype.setConfig() + * @constructor + */ + function Tweenable (opt_initialState, opt_config) { + this._currentState = opt_initialState || {}; + this._configured = false; + this._scheduleFunction = DEFAULT_SCHEDULE_FUNCTION; + + // To prevent unnecessary calls to setConfig do not set default configuration here. + // Only set default configuration immediately before tweening if none has been set. + if (typeof opt_config !== 'undefined') { + this.setConfig(opt_config); + } + } + + /** + * Configure and start a tween. + * @param {Object=} opt_config See Tweenable.prototype.setConfig() + * @return {Tweenable} + */ + Tweenable.prototype.tween = function (opt_config) { + if (this._isTweening) { + return this; + } + + // Only set default config if no configuration has been set previously and none is provided now. + if (opt_config !== undefined || !this._configured) { + this.setConfig(opt_config); + } + + this._start(this.get()); + return this.resume(); + }; + + /** + * Sets the tween configuration. `config` may have the following options: + * + * - __from__ (_Object=_): Starting position. If omitted, the current state is used. + * - __to__ (_Object=_): Ending position. + * - __duration__ (_number=_): How many milliseconds to animate for. + * - __start__ (_Function(Object)=_): Function to execute when the tween begins. Receives the state of the tween as the only parameter. + * - __step__ (_Function(Object)=_): Function to execute on every tick. Receives the state of the tween as the only parameter. This function is not called on the final step of the animation, but `finish` is. + * - __finish__ (_Function(Object)=_): Function to execute upon tween completion. Receives the state of the tween as the only parameter. + * - __easing__ (_Object|string=_): Easing curve name(s) to use for the tween. + * @param {Object} config + * @return {Tweenable} + */ + Tweenable.prototype.setConfig = function (config) { + config = config || {}; + this._configured = true; + + // Init the internal state + this._pausedAtTime = null; + this._start = config.start || noop; + this._step = config.step || noop; + this._finish = config.finish || noop; + this._duration = config.duration || DEFAULT_DURATION; + this._currentState = config.from || this.get(); + this._originalState = this.get(); + this._targetState = config.to || this.get(); + this._timestamp = now(); + + // Aliases used below + var currentState = this._currentState; + var targetState = this._targetState; + + // Ensure that there is always something to tween to. + defaults(targetState, currentState); + + this._easing = composeEasingObject( + currentState, config.easing || DEFAULT_EASING); + + this._filterArgs = + [currentState, this._originalState, targetState, this._easing]; + + applyFilter(this, 'tweenCreated'); + return this; + }; + + /** + * Gets the current state. + * @return {Object} + */ + Tweenable.prototype.get = function () { + return shallowCopy({}, this._currentState); + }; + + /** + * Sets the current state. + * @param {Object} state + */ + Tweenable.prototype.set = function (state) { + this._currentState = state; + }; + + /** + * Pauses a tween. Paused tweens can be resumed from the point at which they were paused. This is different than [`stop()`](#stop), as that method causes a tween to start over when it is resumed. + * @return {Tweenable} + */ + Tweenable.prototype.pause = function () { + this._pausedAtTime = now(); + this._isPaused = true; + return this; + }; + + /** + * Resumes a paused tween. + * @return {Tweenable} + */ + Tweenable.prototype.resume = function () { + if (this._isPaused) { + this._timestamp += now() - this._pausedAtTime; + } + + this._isPaused = false; + this._isTweening = true; + + var self = this; + this._timeoutHandler = function () { + timeoutHandler(self, self._timestamp, self._duration, self._currentState, + self._originalState, self._targetState, self._easing, self._step, + self._scheduleFunction); }; - }]); -})(); + this._timeoutHandler(); + + return this; + }; + + /** + * Stops and cancels a tween. + * @param {boolean=} gotoEnd If false or omitted, the tween just stops at its current state, and the "finish" handler is not invoked. If true, the tweened object's values are instantly set to the target values, and "finish" is invoked. + * @return {Tweenable} + */ + Tweenable.prototype.stop = function (gotoEnd) { + this._isTweening = false; + this._isPaused = false; + this._timeoutHandler = noop; + + if (gotoEnd) { + shallowCopy(this._currentState, this._targetState); + applyFilter(this, 'afterTweenEnd'); + this._finish.call(this, this._currentState); + } + + return this; + }; + + /** + * Returns whether or not a tween is running. + * @return {boolean} + */ + Tweenable.prototype.isPlaying = function () { + return this._isTweening && !this._isPaused; + }; + + /** + * Sets a custom schedule function. + * + * If a custom function is not set the default one is used [`requestAnimationFrame`](https://developer.mozilla.org/en-US/docs/Web/API/window.requestAnimationFrame) if available, otherwise [`setTimeout`](https://developer.mozilla.org/en-US/docs/Web/API/Window.setTimeout)). + * + * @param {Function(Function,number)} scheduleFunction The function to be called to schedule the next frame to be rendered + */ + Tweenable.prototype.setScheduleFunction = function (scheduleFunction) { + this._scheduleFunction = scheduleFunction; + }; + + /** + * `delete`s all "own" properties. Call this when the `Tweenable` instance is no longer needed to free memory. + */ + Tweenable.prototype.dispose = function () { + var prop; + for (prop in this) { + if (this.hasOwnProperty(prop)) { + delete this[prop]; + } + } + }; + + /*! + * Filters are used for transforming the properties of a tween at various + * points in a Tweenable's life cycle. See the README for more info on this. + */ + Tweenable.prototype.filter = {}; + + /*! + * This object contains all of the tweens available to Shifty. It is extendible - simply attach properties to the Tweenable.prototype.formula Object following the same format at linear. + * + * `pos` should be a normalized `number` (between 0 and 1). + */ + Tweenable.prototype.formula = { + linear: function (pos) { + return pos; + } + }; + + formula = Tweenable.prototype.formula; + + shallowCopy(Tweenable, { + 'now': now + ,'each': each + ,'tweenProps': tweenProps + ,'tweenProp': tweenProp + ,'applyFilter': applyFilter + ,'shallowCopy': shallowCopy + ,'defaults': defaults + ,'composeEasingObject': composeEasingObject + }); + + // `root` is provided in the intro/outro files. + + // A hook used for unit testing. + if (typeof SHIFTY_DEBUG_NOW === 'function') { + root.timeoutHandler = timeoutHandler; + } + + // Bootstrap Tweenable appropriately for the environment. + if (typeof exports === 'object') { + // CommonJS + module.exports = Tweenable; + } else if (typeof define === 'function' && define.amd) { + // AMD + define(function () {return Tweenable;}); + } else if (typeof root.Tweenable === 'undefined') { + // Browser: Make `Tweenable` globally accessible. + root.Tweenable = Tweenable; + } + + return Tweenable; + + } ()); + + /*! + * All equations are adapted from Thomas Fuchs' [Scripty2](https://github.com/madrobby/scripty2/blob/master/src/effects/transitions/penner.js). + * + * Based on Easing Equations (c) 2003 [Robert Penner](http://www.robertpenner.com/), all rights reserved. This work is [subject to terms](http://www.robertpenner.com/easing_terms_of_use.html). + */ + + /*! + * TERMS OF USE - EASING EQUATIONS + * Open source under the BSD License. + * Easing Equations (c) 2003 Robert Penner, all rights reserved. + */ + + ;(function () { + + Tweenable.shallowCopy(Tweenable.prototype.formula, { + easeInQuad: function (pos) { + return Math.pow(pos, 2); + }, + + easeOutQuad: function (pos) { + return -(Math.pow((pos - 1), 2) - 1); + }, + + easeInOutQuad: function (pos) { + if ((pos /= 0.5) < 1) {return 0.5 * Math.pow(pos,2);} + return -0.5 * ((pos -= 2) * pos - 2); + }, + + easeInCubic: function (pos) { + return Math.pow(pos, 3); + }, + + easeOutCubic: function (pos) { + return (Math.pow((pos - 1), 3) + 1); + }, + + easeInOutCubic: function (pos) { + if ((pos /= 0.5) < 1) {return 0.5 * Math.pow(pos,3);} + return 0.5 * (Math.pow((pos - 2),3) + 2); + }, + + easeInQuart: function (pos) { + return Math.pow(pos, 4); + }, + + easeOutQuart: function (pos) { + return -(Math.pow((pos - 1), 4) - 1); + }, + + easeInOutQuart: function (pos) { + if ((pos /= 0.5) < 1) {return 0.5 * Math.pow(pos,4);} + return -0.5 * ((pos -= 2) * Math.pow(pos,3) - 2); + }, + + easeInQuint: function (pos) { + return Math.pow(pos, 5); + }, + + easeOutQuint: function (pos) { + return (Math.pow((pos - 1), 5) + 1); + }, + + easeInOutQuint: function (pos) { + if ((pos /= 0.5) < 1) {return 0.5 * Math.pow(pos,5);} + return 0.5 * (Math.pow((pos - 2),5) + 2); + }, + + easeInSine: function (pos) { + return -Math.cos(pos * (Math.PI / 2)) + 1; + }, + + easeOutSine: function (pos) { + return Math.sin(pos * (Math.PI / 2)); + }, + + easeInOutSine: function (pos) { + return (-0.5 * (Math.cos(Math.PI * pos) - 1)); + }, + + easeInExpo: function (pos) { + return (pos === 0) ? 0 : Math.pow(2, 10 * (pos - 1)); + }, + + easeOutExpo: function (pos) { + return (pos === 1) ? 1 : -Math.pow(2, -10 * pos) + 1; + }, + + easeInOutExpo: function (pos) { + if (pos === 0) {return 0;} + if (pos === 1) {return 1;} + if ((pos /= 0.5) < 1) {return 0.5 * Math.pow(2,10 * (pos - 1));} + return 0.5 * (-Math.pow(2, -10 * --pos) + 2); + }, + + easeInCirc: function (pos) { + return -(Math.sqrt(1 - (pos * pos)) - 1); + }, + + easeOutCirc: function (pos) { + return Math.sqrt(1 - Math.pow((pos - 1), 2)); + }, + + easeInOutCirc: function (pos) { + if ((pos /= 0.5) < 1) {return -0.5 * (Math.sqrt(1 - pos * pos) - 1);} + return 0.5 * (Math.sqrt(1 - (pos -= 2) * pos) + 1); + }, + + easeOutBounce: function (pos) { + if ((pos) < (1 / 2.75)) { + return (7.5625 * pos * pos); + } else if (pos < (2 / 2.75)) { + return (7.5625 * (pos -= (1.5 / 2.75)) * pos + 0.75); + } else if (pos < (2.5 / 2.75)) { + return (7.5625 * (pos -= (2.25 / 2.75)) * pos + 0.9375); + } else { + return (7.5625 * (pos -= (2.625 / 2.75)) * pos + 0.984375); + } + }, + + easeInBack: function (pos) { + var s = 1.70158; + return (pos) * pos * ((s + 1) * pos - s); + }, + + easeOutBack: function (pos) { + var s = 1.70158; + return (pos = pos - 1) * pos * ((s + 1) * pos + s) + 1; + }, + + easeInOutBack: function (pos) { + var s = 1.70158; + if ((pos /= 0.5) < 1) {return 0.5 * (pos * pos * (((s *= (1.525)) + 1) * pos - s));} + return 0.5 * ((pos -= 2) * pos * (((s *= (1.525)) + 1) * pos + s) + 2); + }, + + elastic: function (pos) { + return -1 * Math.pow(4,-8 * pos) * Math.sin((pos * 6 - 1) * (2 * Math.PI) / 2) + 1; + }, + + swingFromTo: function (pos) { + var s = 1.70158; + return ((pos /= 0.5) < 1) ? 0.5 * (pos * pos * (((s *= (1.525)) + 1) * pos - s)) : + 0.5 * ((pos -= 2) * pos * (((s *= (1.525)) + 1) * pos + s) + 2); + }, + + swingFrom: function (pos) { + var s = 1.70158; + return pos * pos * ((s + 1) * pos - s); + }, + + swingTo: function (pos) { + var s = 1.70158; + return (pos -= 1) * pos * ((s + 1) * pos + s) + 1; + }, + + bounce: function (pos) { + if (pos < (1 / 2.75)) { + return (7.5625 * pos * pos); + } else if (pos < (2 / 2.75)) { + return (7.5625 * (pos -= (1.5 / 2.75)) * pos + 0.75); + } else if (pos < (2.5 / 2.75)) { + return (7.5625 * (pos -= (2.25 / 2.75)) * pos + 0.9375); + } else { + return (7.5625 * (pos -= (2.625 / 2.75)) * pos + 0.984375); + } + }, + + bouncePast: function (pos) { + if (pos < (1 / 2.75)) { + return (7.5625 * pos * pos); + } else if (pos < (2 / 2.75)) { + return 2 - (7.5625 * (pos -= (1.5 / 2.75)) * pos + 0.75); + } else if (pos < (2.5 / 2.75)) { + return 2 - (7.5625 * (pos -= (2.25 / 2.75)) * pos + 0.9375); + } else { + return 2 - (7.5625 * (pos -= (2.625 / 2.75)) * pos + 0.984375); + } + }, + + easeFromTo: function (pos) { + if ((pos /= 0.5) < 1) {return 0.5 * Math.pow(pos,4);} + return -0.5 * ((pos -= 2) * Math.pow(pos,3) - 2); + }, + + easeFrom: function (pos) { + return Math.pow(pos,4); + }, + + easeTo: function (pos) { + return Math.pow(pos,0.25); + } + }); + + }()); + + /*! + * The Bezier magic in this file is adapted/copied almost wholesale from + * [Scripty2](https://github.com/madrobby/scripty2/blob/master/src/effects/transitions/cubic-bezier.js), + * which was adapted from Apple code (which probably came from + * [here](http://opensource.apple.com/source/WebCore/WebCore-955.66/platform/graphics/UnitBezier.h)). + * Special thanks to Apple and Thomas Fuchs for much of this code. + */ + + /*! + * Copyright (c) 2006 Apple Computer, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder(s) nor the names of any + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + ;(function () { + // port of webkit cubic bezier handling by http://www.netzgesta.de/dev/ + function cubicBezierAtTime(t,p1x,p1y,p2x,p2y,duration) { + var ax = 0,bx = 0,cx = 0,ay = 0,by = 0,cy = 0; + function sampleCurveX(t) {return ((ax * t + bx) * t + cx) * t;} + function sampleCurveY(t) {return ((ay * t + by) * t + cy) * t;} + function sampleCurveDerivativeX(t) {return (3.0 * ax * t + 2.0 * bx) * t + cx;} + function solveEpsilon(duration) {return 1.0 / (200.0 * duration);} + function solve(x,epsilon) {return sampleCurveY(solveCurveX(x,epsilon));} + function fabs(n) {if (n >= 0) {return n;}else {return 0 - n;}} + function solveCurveX(x,epsilon) { + var t0,t1,t2,x2,d2,i; + for (t2 = x, i = 0; i < 8; i++) {x2 = sampleCurveX(t2) - x; if (fabs(x2) < epsilon) {return t2;} d2 = sampleCurveDerivativeX(t2); if (fabs(d2) < 1e-6) {break;} t2 = t2 - x2 / d2;} + t0 = 0.0; t1 = 1.0; t2 = x; if (t2 < t0) {return t0;} if (t2 > t1) {return t1;} + while (t0 < t1) {x2 = sampleCurveX(t2); if (fabs(x2 - x) < epsilon) {return t2;} if (x > x2) {t0 = t2;}else {t1 = t2;} t2 = (t1 - t0) * 0.5 + t0;} + return t2; // Failure. + } + cx = 3.0 * p1x; bx = 3.0 * (p2x - p1x) - cx; ax = 1.0 - cx - bx; cy = 3.0 * p1y; by = 3.0 * (p2y - p1y) - cy; ay = 1.0 - cy - by; + return solve(t, solveEpsilon(duration)); + } + /*! + * getCubicBezierTransition(x1, y1, x2, y2) -> Function + * + * Generates a transition easing function that is compatible + * with WebKit's CSS transitions `-webkit-transition-timing-function` + * CSS property. + * + * The W3C has more information about + * + * CSS3 transition timing functions. + * + * @param {number} x1 + * @param {number} y1 + * @param {number} x2 + * @param {number} y2 + * @return {function} + */ + function getCubicBezierTransition (x1, y1, x2, y2) { + return function (pos) { + return cubicBezierAtTime(pos,x1,y1,x2,y2,1); + }; + } + // End ported code + + /** + * Creates a Bezier easing function and attaches it to `Tweenable.prototype.formula`. This function gives you total control over the easing curve. Matthew Lein's [Ceaser](http://matthewlein.com/ceaser/) is a useful tool for visualizing the curves you can make with this function. + * + * @param {string} name The name of the easing curve. Overwrites the old easing function on Tweenable.prototype.formula if it exists. + * @param {number} x1 + * @param {number} y1 + * @param {number} x2 + * @param {number} y2 + * @return {function} The easing function that was attached to Tweenable.prototype.formula. + */ + Tweenable.setBezierFunction = function (name, x1, y1, x2, y2) { + var cubicBezierTransition = getCubicBezierTransition(x1, y1, x2, y2); + cubicBezierTransition.x1 = x1; + cubicBezierTransition.y1 = y1; + cubicBezierTransition.x2 = x2; + cubicBezierTransition.y2 = y2; + + return Tweenable.prototype.formula[name] = cubicBezierTransition; + }; + + + /** + * `delete`s an easing function from `Tweenable.prototype.formula`. Be careful with this method, as it `delete`s whatever easing formula matches `name` (which means you can delete default Shifty easing functions). + * + * @param {string} name The name of the easing function to delete. + * @return {function} + */ + Tweenable.unsetBezierFunction = function (name) { + delete Tweenable.prototype.formula[name]; + }; + + })(); + + ;(function () { + + function getInterpolatedValues ( + from, current, targetState, position, easing) { + return Tweenable.tweenProps( + position, current, from, targetState, 1, 0, easing); + } + + // Fake a Tweenable and patch some internals. This approach allows us to + // skip uneccessary processing and object recreation, cutting down on garbage + // collection pauses. + var mockTweenable = new Tweenable(); + mockTweenable._filterArgs = []; + + /** + * Compute the midpoint of two Objects. This method effectively calculates a specific frame of animation that [Tweenable#tween](shifty.core.js.html#tween) does many times over the course of a tween. + * + * Example: + * + * ``` + * var interpolatedValues = Tweenable.interpolate({ + * width: '100px', + * opacity: 0, + * color: '#fff' + * }, { + * width: '200px', + * opacity: 1, + * color: '#000' + * }, 0.5); + * + * console.log(interpolatedValues); + * // {opacity: 0.5, width: "150px", color: "rgb(127,127,127)"} + * ``` + * + * @param {Object} from The starting values to tween from. + * @param {Object} targetState The ending values to tween to. + * @param {number} position The normalized position value (between 0.0 and 1.0) to interpolate the values between `from` and `to` for. `from` represents 0 and `to` represents `1`. + * @param {string|Object} easing The easing curve(s) to calculate the midpoint against. You can reference any easing function attached to `Tweenable.prototype.formula`. If omitted, this defaults to "linear". + * @return {Object} + */ + Tweenable.interpolate = function (from, targetState, position, easing) { + var current = Tweenable.shallowCopy({}, from); + var easingObject = Tweenable.composeEasingObject( + from, easing || 'linear'); + + mockTweenable.set({}); + + // Alias and reuse the _filterArgs array instead of recreating it. + var filterArgs = mockTweenable._filterArgs; + filterArgs.length = 0; + filterArgs[0] = current; + filterArgs[1] = from; + filterArgs[2] = targetState; + filterArgs[3] = easingObject; + + // Any defined value transformation must be applied + Tweenable.applyFilter(mockTweenable, 'tweenCreated'); + Tweenable.applyFilter(mockTweenable, 'beforeTween'); + + var interpolatedValues = getInterpolatedValues( + from, current, targetState, position, easingObject); + + // Transform values back into their original format + Tweenable.applyFilter(mockTweenable, 'afterTween'); + + return interpolatedValues; + }; + + }()); + + /** + * Adds string interpolation support to Shifty. + * + * The Token extension allows Shifty to tween numbers inside of strings. Among other things, this allows you to animate CSS properties. For example, you can do this: + * + * ``` + * var tweenable = new Tweenable(); + * tweenable.tween({ + * from: { transform: 'translateX(45px)'}, + * to: { transform: 'translateX(90xp)'} + * }); + * ``` + * + * `translateX(45)` will be tweened to `translateX(90)`. To demonstrate: + * + * ``` + * var tweenable = new Tweenable(); + * tweenable.tween({ + * from: { transform: 'translateX(45px)'}, + * to: { transform: 'translateX(90px)'}, + * step: function (state) { + * console.log(state.transform); + * } + * }); + * ``` + * + * The above snippet will log something like this in the console: + * + * ``` + * translateX(60.3px) + * ... + * translateX(76.05px) + * ... + * translateX(90px) + * ``` + * + * Another use for this is animating colors: + * + * ``` + * var tweenable = new Tweenable(); + * tweenable.tween({ + * from: { color: 'rgb(0,255,0)'}, + * to: { color: 'rgb(255,0,255)'}, + * step: function (state) { + * console.log(state.color); + * } + * }); + * ``` + * + * The above snippet will log something like this: + * + * ``` + * rgb(84,170,84) + * ... + * rgb(170,84,170) + * ... + * rgb(255,0,255) + * ``` + * + * This extension also supports hexadecimal colors, in both long (`#ff00ff`) and short (`#f0f`) forms. Be aware that hexadecimal input values will be converted into the equivalent RGB output values. This is done to optimize for performance. + * + * ``` + * var tweenable = new Tweenable(); + * tweenable.tween({ + * from: { color: '#0f0'}, + * to: { color: '#f0f'}, + * step: function (state) { + * console.log(state.color); + * } + * }); + * ``` + * + * This snippet will generate the same output as the one before it because equivalent values were supplied (just in hexadecimal form rather than RGB): + * + * ``` + * rgb(84,170,84) + * ... + * rgb(170,84,170) + * ... + * rgb(255,0,255) + * ``` + * + * ## Easing support + * + * Easing works somewhat differently in the Token extension. This is because some CSS properties have multiple values in them, and you might need to tween each value along its own easing curve. A basic example: + * + * ``` + * var tweenable = new Tweenable(); + * tweenable.tween({ + * from: { transform: 'translateX(0px) translateY(0px)'}, + * to: { transform: 'translateX(100px) translateY(100px)'}, + * easing: { transform: 'easeInQuad' }, + * step: function (state) { + * console.log(state.transform); + * } + * }); + * ``` + * + * The above snippet create values like this: + * + * ``` + * translateX(11.560000000000002px) translateY(11.560000000000002px) + * ... + * translateX(46.24000000000001px) translateY(46.24000000000001px) + * ... + * translateX(100px) translateY(100px) + * ``` + * + * In this case, the values for `translateX` and `translateY` are always the same for each step of the tween, because they have the same start and end points and both use the same easing curve. We can also tween `translateX` and `translateY` along independent curves: + * + * ``` + * var tweenable = new Tweenable(); + * tweenable.tween({ + * from: { transform: 'translateX(0px) translateY(0px)'}, + * to: { transform: 'translateX(100px) translateY(100px)'}, + * easing: { transform: 'easeInQuad bounce' }, + * step: function (state) { + * console.log(state.transform); + * } + * }); + * ``` + * + * The above snippet create values like this: + * + * ``` + * translateX(10.89px) translateY(82.355625px) + * ... + * translateX(44.89000000000001px) translateY(86.73062500000002px) + * ... + * translateX(100px) translateY(100px) + * ``` + * + * `translateX` and `translateY` are not in sync anymore, because `easeInQuad` was specified for `translateX` and `bounce` for `translateY`. Mixing and matching easing curves can make for some interesting motion in your animations. + * + * The order of the space-separated easing curves correspond the token values they apply to. If there are more token values than easing curves listed, the last easing curve listed is used. + */ + function token () { + // Functionality for this extension runs implicitly if it is loaded. + } /*!*/ + + // token function is defined above only so that dox-foundation sees it as + // documentation and renders it. It is never used, and is optimized away at + // build time. + + ;(function (Tweenable) { + + /*! + * @typedef {{ + * formatString: string + * chunkNames: Array. + * }} + */ + var formatManifest; + + // CONSTANTS + + var R_NUMBER_COMPONENT = /(\d|\-|\.)/; + var R_FORMAT_CHUNKS = /([^\-0-9\.]+)/g; + var R_UNFORMATTED_VALUES = /[0-9.\-]+/g; + var R_RGB = new RegExp( + 'rgb\\(' + R_UNFORMATTED_VALUES.source + + (/,\s*/.source) + R_UNFORMATTED_VALUES.source + + (/,\s*/.source) + R_UNFORMATTED_VALUES.source + '\\)', 'g'); + var R_RGB_PREFIX = /^.*\(/; + var R_HEX = /#([0-9]|[a-f]){3,6}/gi; + var VALUE_PLACEHOLDER = 'VAL'; + + // HELPERS + + var getFormatChunksFrom_accumulator = []; + /*! + * @param {Array.number} rawValues + * @param {string} prefix + * + * @return {Array.} + */ + function getFormatChunksFrom (rawValues, prefix) { + getFormatChunksFrom_accumulator.length = 0; + + var rawValuesLength = rawValues.length; + var i; + + for (i = 0; i < rawValuesLength; i++) { + getFormatChunksFrom_accumulator.push('_' + prefix + '_' + i); + } + + return getFormatChunksFrom_accumulator; + } + + /*! + * @param {string} formattedString + * + * @return {string} + */ + function getFormatStringFrom (formattedString) { + var chunks = formattedString.match(R_FORMAT_CHUNKS); + + if (!chunks) { + // chunks will be null if there were no tokens to parse in + // formattedString (for example, if formattedString is '2'). Coerce + // chunks to be useful here. + chunks = ['', '']; + + // If there is only one chunk, assume that the string is a number + // followed by a token... + // NOTE: This may be an unwise assumption. + } else if (chunks.length === 1 || + // ...or if the string starts with a number component (".", "-", or a + // digit)... + formattedString[0].match(R_NUMBER_COMPONENT)) { + // ...prepend an empty string here to make sure that the formatted number + // is properly replaced by VALUE_PLACEHOLDER + chunks.unshift(''); + } + + return chunks.join(VALUE_PLACEHOLDER); + } + + /*! + * Convert all hex color values within a string to an rgb string. + * + * @param {Object} stateObject + * + * @return {Object} The modified obj + */ + function sanitizeObjectForHexProps (stateObject) { + Tweenable.each(stateObject, function (prop) { + var currentProp = stateObject[prop]; + + if (typeof currentProp === 'string' && currentProp.match(R_HEX)) { + stateObject[prop] = sanitizeHexChunksToRGB(currentProp); + } + }); + } + + /*! + * @param {string} str + * + * @return {string} + */ + function sanitizeHexChunksToRGB (str) { + return filterStringChunks(R_HEX, str, convertHexToRGB); + } + + /*! + * @param {string} hexString + * + * @return {string} + */ + function convertHexToRGB (hexString) { + var rgbArr = hexToRGBArray(hexString); + return 'rgb(' + rgbArr[0] + ',' + rgbArr[1] + ',' + rgbArr[2] + ')'; + } + + var hexToRGBArray_returnArray = []; + /*! + * Convert a hexadecimal string to an array with three items, one each for + * the red, blue, and green decimal values. + * + * @param {string} hex A hexadecimal string. + * + * @returns {Array.} The converted Array of RGB values if `hex` is a + * valid string, or an Array of three 0's. + */ + function hexToRGBArray (hex) { + + hex = hex.replace(/#/, ''); + + // If the string is a shorthand three digit hex notation, normalize it to + // the standard six digit notation + if (hex.length === 3) { + hex = hex.split(''); + hex = hex[0] + hex[0] + hex[1] + hex[1] + hex[2] + hex[2]; + } + + hexToRGBArray_returnArray[0] = hexToDec(hex.substr(0, 2)); + hexToRGBArray_returnArray[1] = hexToDec(hex.substr(2, 2)); + hexToRGBArray_returnArray[2] = hexToDec(hex.substr(4, 2)); + + return hexToRGBArray_returnArray; + } + + /*! + * Convert a base-16 number to base-10. + * + * @param {Number|String} hex The value to convert + * + * @returns {Number} The base-10 equivalent of `hex`. + */ + function hexToDec (hex) { + return parseInt(hex, 16); + } + + /*! + * Runs a filter operation on all chunks of a string that match a RegExp + * + * @param {RegExp} pattern + * @param {string} unfilteredString + * @param {function(string)} filter + * + * @return {string} + */ + function filterStringChunks (pattern, unfilteredString, filter) { + var pattenMatches = unfilteredString.match(pattern); + var filteredString = unfilteredString.replace(pattern, VALUE_PLACEHOLDER); + + if (pattenMatches) { + var pattenMatchesLength = pattenMatches.length; + var currentChunk; + + for (var i = 0; i < pattenMatchesLength; i++) { + currentChunk = pattenMatches.shift(); + filteredString = filteredString.replace( + VALUE_PLACEHOLDER, filter(currentChunk)); + } + } + + return filteredString; + } + + /*! + * Check for floating point values within rgb strings and rounds them. + * + * @param {string} formattedString + * + * @return {string} + */ + function sanitizeRGBChunks (formattedString) { + return filterStringChunks(R_RGB, formattedString, sanitizeRGBChunk); + } + + /*! + * @param {string} rgbChunk + * + * @return {string} + */ + function sanitizeRGBChunk (rgbChunk) { + var numbers = rgbChunk.match(R_UNFORMATTED_VALUES); + var numbersLength = numbers.length; + var sanitizedString = rgbChunk.match(R_RGB_PREFIX)[0]; + + for (var i = 0; i < numbersLength; i++) { + sanitizedString += parseInt(numbers[i], 10) + ','; + } + + sanitizedString = sanitizedString.slice(0, -1) + ')'; + + return sanitizedString; + } + + /*! + * @param {Object} stateObject + * + * @return {Object} An Object of formatManifests that correspond to + * the string properties of stateObject + */ + function getFormatManifests (stateObject) { + var manifestAccumulator = {}; + + Tweenable.each(stateObject, function (prop) { + var currentProp = stateObject[prop]; + + if (typeof currentProp === 'string') { + var rawValues = getValuesFrom(currentProp); + + manifestAccumulator[prop] = { + 'formatString': getFormatStringFrom(currentProp) + ,'chunkNames': getFormatChunksFrom(rawValues, prop) + }; + } + }); + + return manifestAccumulator; + } + + /*! + * @param {Object} stateObject + * @param {Object} formatManifests + */ + function expandFormattedProperties (stateObject, formatManifests) { + Tweenable.each(formatManifests, function (prop) { + var currentProp = stateObject[prop]; + var rawValues = getValuesFrom(currentProp); + var rawValuesLength = rawValues.length; + + for (var i = 0; i < rawValuesLength; i++) { + stateObject[formatManifests[prop].chunkNames[i]] = +rawValues[i]; + } + + delete stateObject[prop]; + }); + } + + /*! + * @param {Object} stateObject + * @param {Object} formatManifests + */ + function collapseFormattedProperties (stateObject, formatManifests) { + Tweenable.each(formatManifests, function (prop) { + var currentProp = stateObject[prop]; + var formatChunks = extractPropertyChunks( + stateObject, formatManifests[prop].chunkNames); + var valuesList = getValuesList( + formatChunks, formatManifests[prop].chunkNames); + currentProp = getFormattedValues( + formatManifests[prop].formatString, valuesList); + stateObject[prop] = sanitizeRGBChunks(currentProp); + }); + } + + /*! + * @param {Object} stateObject + * @param {Array.} chunkNames + * + * @return {Object} The extracted value chunks. + */ + function extractPropertyChunks (stateObject, chunkNames) { + var extractedValues = {}; + var currentChunkName, chunkNamesLength = chunkNames.length; + + for (var i = 0; i < chunkNamesLength; i++) { + currentChunkName = chunkNames[i]; + extractedValues[currentChunkName] = stateObject[currentChunkName]; + delete stateObject[currentChunkName]; + } + + return extractedValues; + } + + var getValuesList_accumulator = []; + /*! + * @param {Object} stateObject + * @param {Array.} chunkNames + * + * @return {Array.} + */ + function getValuesList (stateObject, chunkNames) { + getValuesList_accumulator.length = 0; + var chunkNamesLength = chunkNames.length; + + for (var i = 0; i < chunkNamesLength; i++) { + getValuesList_accumulator.push(stateObject[chunkNames[i]]); + } + + return getValuesList_accumulator; + } + + /*! + * @param {string} formatString + * @param {Array.} rawValues + * + * @return {string} + */ + function getFormattedValues (formatString, rawValues) { + var formattedValueString = formatString; + var rawValuesLength = rawValues.length; + + for (var i = 0; i < rawValuesLength; i++) { + formattedValueString = formattedValueString.replace( + VALUE_PLACEHOLDER, +rawValues[i].toFixed(4)); + } + + return formattedValueString; + } + + /*! + * Note: It's the duty of the caller to convert the Array elements of the + * return value into numbers. This is a performance optimization. + * + * @param {string} formattedString + * + * @return {Array.|null} + */ + function getValuesFrom (formattedString) { + return formattedString.match(R_UNFORMATTED_VALUES); + } + + /*! + * @param {Object} easingObject + * @param {Object} tokenData + */ + function expandEasingObject (easingObject, tokenData) { + Tweenable.each(tokenData, function (prop) { + var currentProp = tokenData[prop]; + var chunkNames = currentProp.chunkNames; + var chunkLength = chunkNames.length; + var easingChunks = easingObject[prop].split(' '); + var lastEasingChunk = easingChunks[easingChunks.length - 1]; + + for (var i = 0; i < chunkLength; i++) { + easingObject[chunkNames[i]] = easingChunks[i] || lastEasingChunk; + } + + delete easingObject[prop]; + }); + } + + /*! + * @param {Object} easingObject + * @param {Object} tokenData + */ + function collapseEasingObject (easingObject, tokenData) { + Tweenable.each(tokenData, function (prop) { + var currentProp = tokenData[prop]; + var chunkNames = currentProp.chunkNames; + var chunkLength = chunkNames.length; + var composedEasingString = ''; + + for (var i = 0; i < chunkLength; i++) { + composedEasingString += ' ' + easingObject[chunkNames[i]]; + delete easingObject[chunkNames[i]]; + } + + easingObject[prop] = composedEasingString.substr(1); + }); + } + + Tweenable.prototype.filter.token = { + 'tweenCreated': function (currentState, fromState, toState, easingObject) { + sanitizeObjectForHexProps(currentState); + sanitizeObjectForHexProps(fromState); + sanitizeObjectForHexProps(toState); + this._tokenData = getFormatManifests(currentState); + }, + + 'beforeTween': function (currentState, fromState, toState, easingObject) { + expandEasingObject(easingObject, this._tokenData); + expandFormattedProperties(currentState, this._tokenData); + expandFormattedProperties(fromState, this._tokenData); + expandFormattedProperties(toState, this._tokenData); + }, + + 'afterTween': function (currentState, fromState, toState, easingObject) { + collapseFormattedProperties(currentState, this._tokenData); + collapseFormattedProperties(fromState, this._tokenData); + collapseFormattedProperties(toState, this._tokenData); + collapseEasingObject(easingObject, this._tokenData); + } + }; + + } (Tweenable)); + + }(this)); + + return this.Tweenable; +}); (function() { "use strict"; diff --git a/dist/angular-carousel.min.css b/dist/angular-carousel.min.css index cc56426..cae64c1 100644 --- a/dist/angular-carousel.min.css +++ b/dist/angular-carousel.min.css @@ -1 +1 @@ -.rn-carousel-container{overflow:hidden;position:relative;-ms-touch-action:none;touch-action:none}.rn-carousel-slides{-webkit-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);transform:translate3d(0,0,0);position:relative;white-space:nowrap;overflow:visible;padding:0;margin:0}:root .rn-carousel-slides{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0);position:relative;white-space:nowrap;overflow:visible;padding:0;margin:0}.rn-carousel-slide{white-space:normal;vertical-align:top;display:inline-block;width:100%;height:100%;-webkit-backface-visibility:hidden;-ms-backface-visibility:hidden;backface-visibility:hidden}.rn-carousel-indicator{width:100%;text-align:center;height:20px;background-color:#000;background-color:rgba(0,0,0,.6);position:relative;bottom:0;cursor:pointer}.rn-carousel-indicator span{-webkit-transition:color .2s ease-out;transition:color .2s ease-out;padding:0 5px;color:#333}.rn-carousel-indicator span:before{content:"\25cf"}.rn-carousel-indicator span.ng-leave{-webkit-transition:none!important;transition:none!important}.rn-carousel-indicator .active{color:#fff}.rn-carousel-control{-webkit-transition:opacity .2s ease-out;transition:opacity .2s ease-out;font-size:30px;position:absolute;top:50%;margin-top:-35px;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 +body{background:#ccc}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:none;touch-action:none}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-indicators] span{cursor:pointer;color:#666}div[rn-carousel-indicators] 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 diff --git a/dist/angular-carousel.min.js b/dist/angular-carousel.min.js index 3525874..34c4403 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.2.4 - 2014-07-25 + * @version v0.3.0 - 2014-10-13 * @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.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.carouselExposedIndex0&&a.index--},a.next=function(){a.index\n \n \n
')}]),angular.module("angular-carousel").directive("rnCarouselIndicators",[function(){return{restrict:"A",replace:!0,scope:{items:"=",index:"="},templateUrl:"carousel-indicators.html"}}]),angular.module("angular-carousel").run(["$templateCache",function(a){a.put("carousel-indicators.html",'
\n \n
')}]),function(){"use strict";angular.module("angular-carousel").directive("rnCarousel",["$swipe","$window","$document","$parse","$compile","$rootScope",function(a,b,c,d,e,f){var g=0,h=75,i=.05,j=3,k=b.requestAnimationFrame||b.webkitRequestAnimationFrame||b.mozRequestAnimationFrame;return{restrict:"A",scope:!0,compile:function(l,m){var n,o,p=l.children()[0].attributes,q=!1,r=!1,s=!1;return l.addClass("rn-carousel-slides"),l.children().addClass("rn-carousel-slide"),["ng-repeat","data-ng-repeat","x-ng-repeat"].every(function(a){var b=p[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)&&(r=!0,b.value=n+" in "+o+"|carouselSlice:carouselBufferIndex:carouselBufferSize",d&&(b.value+=" track by "+d)),q=!0,!1}return!0}),function(l,m,n){function p(){for(var a=[],b=0;Q>b;b++)a[b]=b;l.carouselIndicatorArray=a}function t(){var a=T.children();return I=0===a.length?T[0].getBoundingClientRect().width:a[0].getBoundingClientRect().width}function u(){U.css("width","100%");var a=t();a&&U.css("width",a+"px")}function v(a){isNaN(a)&&(a=l.carouselIndex*I),P=a;var b=-Math.round(P);b+=l.carouselBufferIndex*I,T[0].style[J]=Z?"translate3d("+b+"px, 0, 0)":"translate("+b+"px, 0)"}function w(){var a,b;M&&(a=Date.now()-O,b=M*Math.exp(-a/h),b>j||-j>b?(v(N-b),k(w)):z(N/I))}function x(a){return a>=Q?Q:0>=a?0:a}function y(){var a=0,b=(l.carouselBufferSize-1)/2;r&&(a=l.carouselIndex<=b?0:QQ-l.carouselBufferSize?Q-l.carouselBufferSize:l.carouselIndex-b),l.carouselBufferIndex=a}function z(a,b){return isNaN(a)&&(a=l.carouselIndex),b?(P=a*I,F(null,null,!0),void 0):(l.carouselIndex=x(a),y(),"$apply"!==f.$$phase&&"$digest"!==f.$$phase&&(s?l.$apply():l.$digest()),v(),void 0)}function A(){return i*I}function B(a){R=!0,F({x:a.clientX,y:a.clientY},a)}function C(a){var b=a;return 0===l.carouselIndex?b=Math.max(-A(),b):l.carouselIndex===Q-1&&(b=Math.min((Q-1)*I+A(),b)),b}function D(a){return c.bind("mouseup",B),K=!0,L=a.x,M=0,O=Date.now(),!1}function E(a){var b,c;return K&&(b=a.x,c=L-b,(c>2||-2>c)&&(R=!0,L=b,k(function(){v(C(P+c))}))),!1}function F(a,b,d){if(!b||R){c.unbind("mouseup",B),K=!1,R=!1,N=P;var e=A(),f=l.carouselIndex*I,g=f-N,h=-Math[g>=0?"ceil":"floor"](g/I),i=Math.abs(g)>e;h+l.carouselIndex>=Q&&(h=Q-1-l.carouselIndex),h+l.carouselIndex<0&&(h=-l.carouselIndex);var j=i?h:0;return N=(j+l.carouselIndex)*I,M=N-P,O=Date.now(),d&&(M=P-f),k(w),!1}}function G(){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}function H(){u(),z()}g++;var I,J,K,L,M,N,O,P=0,Q=0,R=!1,S=!0,T=m.wrap(""),U=T.parent();if((angular.isDefined(n.rnCarouselIndicator)||angular.isDefined(n.rnCarouselControl))&&(p(),l.$watch("carouselIndex",function(a){l.indicatorIndex=a,l.carouselExposedIndex=a}),l.$watch("indicatorIndex",function(a){z(a,!0)})),angular.isDefined(n.rnCarouselPreventAnimation)&&(S=!1),l.$watch("carouselExposedIndex",function(a){z(a,!0)}),angular.isDefined(n.rnCarouselIndicator)){var V=e("")(l);U.append(V)}if(angular.isDefined(n.rnCarouselControl)){var W=e("")(l);U.append(W)}if(l.carouselBufferIndex=0,l.carouselBufferSize=5,l.carouselIndex=0,n.rnCarouselIndex){var X=function(a){Y.assign(l.$parent,a)},Y=d(n.rnCarouselIndex);angular.isFunction(Y.assign)?(l.$watch("carouselIndex",function(a){X(a)}),l.carouselIndex=Y(l),l.$parent.$watch(Y,function(a){void 0!==a&&(a>=Q?(a=Q-1,X(a)):0>a&&(a=0,X(a)),z(a,S))}),s=!0):isNaN(n.rnCarouselIndex)||(l.carouselIndex=parseInt(n.rnCarouselIndex,10))}q?l.$watchCollection(o,function(a){Q=0,angular.isArray(a)?Q=a.length:angular.isObject(a)&&(Q=Object.keys(a).length),p(),I||u(),z(l.carouselIndex)}):(Q=m.children().length,p(),u()),n.$observe("rnCarouselSwipe",function(b){"false"!==b&&"off"!==b?a.bind(T,{start:D,move:E,end:F,cancel:function(a){F({},a)}}):T.unbind()}),s||z(l.carouselIndex),J="transform",["webkit","Moz","O","ms"].every(function(a){var b=a+"Transform";return"undefined"!=typeof document.body.style[b]?(J=b,!1):!0});var Z=G(),$=angular.element(b);$.bind("orientationchange",H),$.bind("resize",H),l.$on("$destroy",function(){c.unbind("mouseup",B),$.unbind("orientationchange",H),$.unbind("resize",H)})}}}}])}(),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",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,l=.05;b.requestAnimationFrame||b.webkitRequestAnimationFrame||b.mozRequestAnimationFrame}return{restrict:"A",scope:!0,compile:function(m,n){var o,p,q=m[0].querySelector("li").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(o=c[1],p=c[2],o)return angular.isDefined(n.rnCarouselBuffered)&&(s=!0,b.value=o+" in "+p+"|carouselSlice:carouselBufferIndex:carouselBufferSize",d&&(b.value+=" track by "+d)),r=!0,!1}return!0}),function(m,n,o){function q(){return n[0].querySelectorAll("li")}function t(a){L=!0,A({x:a.clientX,y:a.clientY},a)}function u(a){var b,c;c=100*m.carouselBufferIndex+a,angular.forEach(q(),function(a,d){b=i(h(d,c,I.transitionType)),a.getAttribute("style")!==b&&a.setAttribute("style",b)})}function v(a,b){if(1===k&&console.log("goToSlide",arguments,O),void 0===a&&(a=m.carouselIndex),b=b||{},b.animate===!1||"none"===I.transitionType)return O=!1,K=-100*a,m.carouselIndex=a,B(),void 0;O=!0;var c=new j;c.tween({from:{x:K},to:{x:-100*a},duration:I.transitionDuration,easing:I.transitionEasing,step:function(a){u(a.x)},finish:function(){O=!1,m.$apply(function(){m.carouselIndex=a,K=-100*a,B()})}})}function w(){return n[0].getBoundingClientRect().width}function x(){M=w()}function y(a){return c.bind("mouseup",t),x(),N=n[0].querySelector("li").getBoundingClientRect().left,D=!0,E=a.x,!1}function z(a){var b,c;if(D&&(b=a.x,c=E-b,c>2||-2>c)){L=!0;var d=K+100*-c/M;u(d)}return!1}function A(a,b){if((!b||L)&&(c.unbind("mouseup",t),D=!1,L=!1,F=E-a.x,0!==F&&!O))if(K+=100*-F/M,I.isSequential){var d=l*M,e=-F,f=-Math[e>=0?"ceil":"floor"](e/M),g=Math.abs(e)>d;G&&f+m.carouselIndex>=G.length&&(f=G.length-1-m.carouselIndex),f+m.carouselIndex<0&&(f=-m.carouselIndex);var h=g?f:0;F=m.carouselIndex+h,v(F)}else m.$apply(function(){m.carouselIndex=parseInt(-K/100,10),B()})}function B(){var a=0,b=(m.carouselBufferSize-1)/2;s?(a=m.carouselIndex<=b?0:G&&G.lengthG.length-m.carouselBufferSize?G.length-m.carouselBufferSize:m.carouselIndex-b,m.carouselBufferIndex=a,f(function(){u(K)},0,!1)):f(function(){u(K)},0,!1)}function C(){x(),v()}k++;var D,E,F,G,H={transitionType:o.rnCarouselTransition||"slide",transitionEasing:"easeTo",transitionDuration:300,isSequential:!0,autoSlideDuration:3,bufferSize:5},I=angular.extend({},H),J=!1,K=0,L=!1,M=null,N=null,O=!1;if(void 0!==o.rnCarouselControls){var P='
\n \n \n
';n.append(e(angular.element(P))(m))}a.bind(n,{start:y,move:z,end:A,cancel:function(a){A({},a)}}),m.nextSlide=function(a){1===k&&console.log("nextSlide, scope.carouselIndex",m.carouselIndex);var b=m.carouselIndex+1;b>G.length-1&&(b=0),O||v(b,a)},m.prevSlide=function(a){var b=m.carouselIndex-1;0>b&&(b=G.length-1),v(b,a)};var Q=!0;m.carouselIndex=0,r||(G=[],angular.forEach(q(),function(a,b){G.push({id:b})}));var R;if(void 0!==o.rnCarouselAutoSlide){var S=parseInt(o.rnCarouselAutoSlide,10)||I.autoSlideDuration;R=g(function(){O||D||m.nextSlide()},1e3*S)}if(o.rnCarouselIndex){var T=function(a){U.assign(m.$parent,a)},U=d(o.rnCarouselIndex);angular.isFunction(U.assign)?(m.$watch("carouselIndex",function(a){console.log("watch carouselIndex",a),O||T(a)}),m.$parent.$watch(U,function(a){void 0!==a&&null!==a&&(G&&a>=G.length?(a=G.length-1,T(a)):G&&0>a&&(a=0,T(a)),O||v(a,{animate:!Q}),Q=!1)}),J=!0):isNaN(o.rnCarouselIndex)||v(parseInt(o.rnCarouselIndex,10),{animate:!1})}else v(0,{animate:!Q}),Q=!1;r&&m.$watchCollection(p,function(a){G=a,v(m.carouselIndex)}),m.$on("$destroy",function(){c.unbind("mouseup",t)}),m.carouselBufferIndex=0,m.carouselBufferSize=I.bufferSize;var V=angular.element(b);V.bind("orientationchange",C),V.bind("resize",C),m.$on("$destroy",function(){c.unbind("mouseup",t),V.unbind("orientationchange",C),V.unbind("resize",C)})}}}}])}(),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 diff --git a/index.html b/index.html index 235a15f..c1de146 100644 --- a/index.html +++ b/index.html @@ -19,161 +19,127 @@

AngularJS Touch Carousel

Swipe these demos with your mouse or finger -

ngRepeat demo (buffered carousel)

-
A simple buffered ng-repeat with a custom template. -
- Swipe 50 slides with only 5 slides in the DOM -
-
    -
  • -
    - {{ slide.label }} / {{ slides.length }} +
    +
    +

    Buffered ngRepeat demo

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

template-based demo

-
Various blocks automagically converted to a carousel. +
+ index : +
    +
  • +
    + #{{ slide.id }} +
    +
    • +
+
+
+
+

ngRepeat with auto-slide, controls and indicators

+
+
+
+ index: +
    +
  • +
    + #{{ slide.id }} +
    +
    • +
+
+
+

- Just add rn-carousel-indicator to display clickable indicators - -
    -
  • - This is a standard template -
    slide #1
    -
    • -
  • - Here's sophie :
    - -
    • -
  • - A friend of mine :
    - -
    • -
  • - And to finish : - -
    • -
- -

Standard carousel with thumbs navigation

-
This one has an initial index and the thumbs controls the rn-carousel-index binding
-
    -
  • -
-
-
-
- -

carousel with builtin prev/next controls

-
just add rn-carousel-control attribute to enable builtin controls
-
    -
  • -
    - {{ slide.label }} / {{ slides.length }} +
    +

    ngRepeat with custom transition

    +
    Use the 'hexagon' transition. index is shared with the carousel below.
    -
    • -
- -

buffered ngRepeat carousel with custom controls

-
Custom controls demo, just update the rn-carousel-index index binding
-
    -
  • -
    - {{ slide.label }} / {{ slides4.length }} -
    - carouselIndex: {{ carouselIndex }}
    - carouselBufferIndex: {{ carouselBufferIndex }}
    +
    +
      +
    • +
      + #{{ slide.id }} +
      +
      • +
    -
    • -
-
- - {{ slideIndex + 1 }} / {{ slides4.length }} - - - -
- -

object-based ngRepeat carousel with indicators

-
Use the object-based ngRepeat syntax. (not compatible with buffering)
-
    -
  • -
    {{ label }}
    -
    • -
- -

togglable carousel via ng-if

-
If you use ng-if, be sure to use the dot-notation syntax for the index binding as it creates a child scope.
- -

- -
    -
  • -
    #{{ $index + 1 }}
    -
    • -
+ +
+
+

ngRepeat with custom transition

+
Use the 'zoom' transition. index is shared with the carousel above. +
+
+
    +
  • +
    + #{{ slide.id }} +
    +
    • +
+
+
+
+
+

Custom templates without ng-repeat and auto-slide

+
+
+
+
    +
  • Slide 1
    • +
  • Slide 2
    • +
  • Slide 3
    • +
  • Slide 4
    • +
  • Slide 5
    • +
  • Slide 6
    • +
  • Slide 7
    • +
  • Slide 8
    • +
  • Slide 9
    • +
+
+
-

Autoplay slider

-
- By adding rn-carousel-auto-slide with an integer value will make the slider automatically change the visible slide after n seconds -
- By adding rn-carousel-pause-on-hover="true" the slide will pause on mouse hover and start on mouse leave
-
    -
  • - This is a standard template -
    slide #1
    -
    • -
  • - Here's sophie :
    - -
    • -
  • - A friend of mine :
    - -
    • -
  • - And to finish : - -
    • -
-

-

Other demos

- -

- - + - --> + +