Skip to content

Commit 272ccc7

Browse files
committed
Merge branch 'compilation-options' of https://github.com/wasbazi/angular-carousel into wasbazi-compilation-options
2 parents ecbbb78 + 976c34c commit 272ccc7

File tree

7 files changed

+19
-11
lines changed

7 files changed

+19
-11
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ angular.module('MyApp', ['angular-carousel']);
5050
- `rn-carousel-transition` : transition type, can be one of `slide, zoom, hexagon, fadeAndSlide, none`. (default=slide)
5151
- `rn-carousel-locked`: two way binding boolean that lock/unlock the carousel
5252
- `rn-carousel-deep-watch`: Deep watch the collection which enable to dynamically add slides at beginning without corrupting position
53+
- `rn-carousel-easing`: add this attritube to specify a formula for easing, these can be found in the (https://github.com/jeremyckahn/shifty/blob/master/src/shifty.formulas.js)[shifty
54+
library] (default=easeIn)
55+
- `rn-carousel-duration`: add this attritube to set the duration of the transition (default=300)
5356

5457
## Indicators
5558

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angular-carousel",
33
"description": "Angular Carousel - Mobile friendly touch carousel for AngularJS",
4-
"version": "0.3.8",
4+
"version": "0.3.9",
55
"homepage": "http://revolunet.github.com/angular-carousel",
66
"author": "Julien Bouquillon <julien@revolunet.com>",
77
"repository": {

dist/angular-carousel.css.map

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-carousel.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Angular Carousel - Mobile friendly touch carousel for AngularJS
3-
* @version v0.3.8 - 2015-01-26
3+
* @version v0.3.9 - 2015-01-26
44
* @link http://revolunet.github.com/angular-carousel
55
* @author Julien Bouquillon <julien@revolunet.com>
66
* @license MIT License, http://www.opensource.org/licenses/MIT
@@ -265,9 +265,8 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach
265265

266266
var defaultOptions = {
267267
transitionType: iAttributes.rnCarouselTransition || 'slide',
268-
transitionEasing: 'easeTo',
269-
transitionDuration: 300,
270-
/* do touchend trigger next slide automatically */
268+
transitionEasing: iAttributes.rnCarouselEasing || 'easeTo',
269+
transitionDuration: parseInt(iAttributes.rnCarouselDuration, 10) || 300,
271270
isSequential: true,
272271
autoSlideDuration: 3,
273272
bufferSize: 5,

dist/angular-carousel.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angular-carousel",
33
"description": "Angular Carousel - Mobile friendly touch carousel for AngularJS",
4-
"version": "0.3.8",
4+
"version": "0.3.9",
55
"homepage": "http://revolunet.github.com/angular-carousel",
66
"author": "Julien Bouquillon <julien@revolunet.com>",
77
"repository": {

src/directives/rn-carousel.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,8 @@
186186

187187
var defaultOptions = {
188188
transitionType: iAttributes.rnCarouselTransition || 'slide',
189-
transitionEasing: 'easeTo',
190-
transitionDuration: 300,
191-
/* do touchend trigger next slide automatically */
189+
transitionEasing: iAttributes.rnCarouselEasing || 'easeTo',
190+
transitionDuration: parseInt(iAttributes.rnCarouselDuration, 10) || 300,
192191
isSequential: true,
193192
autoSlideDuration: 3,
194193
bufferSize: 5,

0 commit comments

Comments
 (0)