Skip to content
This repository has been archived by the owner on May 10, 2018. It is now read-only.

Commit

Permalink
Merge branch 'compilation-options' of https://github.com/wasbazi/angu…
Browse files Browse the repository at this point in the history
…lar-carousel into wasbazi-compilation-options
  • Loading branch information
revolunet committed Jan 26, 2015
2 parents ecbbb78 + 976c34c commit 272ccc7
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 11 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ angular.module('MyApp', ['angular-carousel']);
- `rn-carousel-transition` : transition type, can be one of `slide, zoom, hexagon, fadeAndSlide, none`. (default=slide)
- `rn-carousel-locked`: two way binding boolean that lock/unlock the carousel
- `rn-carousel-deep-watch`: Deep watch the collection which enable to dynamically add slides at beginning without corrupting position
- `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
library] (default=easeIn)
- `rn-carousel-duration`: add this attritube to set the duration of the transition (default=300)

## Indicators

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "angular-carousel",
"description": "Angular Carousel - Mobile friendly touch carousel for AngularJS",
"version": "0.3.8",
"version": "0.3.9",
"homepage": "http://revolunet.github.com/angular-carousel",
"author": "Julien Bouquillon <[email protected]>",
"repository": {
Expand Down
7 changes: 7 additions & 0 deletions dist/angular-carousel.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions dist/angular-carousel.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Angular Carousel - Mobile friendly touch carousel for AngularJS
* @version v0.3.8 - 2015-01-26
* @version v0.3.9 - 2015-01-26
* @link http://revolunet.github.com/angular-carousel
* @author Julien Bouquillon <[email protected]>
* @license MIT License, http://www.opensource.org/licenses/MIT
Expand Down Expand Up @@ -265,9 +265,8 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach

var defaultOptions = {
transitionType: iAttributes.rnCarouselTransition || 'slide',
transitionEasing: 'easeTo',
transitionDuration: 300,
/* do touchend trigger next slide automatically */
transitionEasing: iAttributes.rnCarouselEasing || 'easeTo',
transitionDuration: parseInt(iAttributes.rnCarouselDuration, 10) || 300,
isSequential: true,
autoSlideDuration: 3,
bufferSize: 5,
Expand Down
4 changes: 2 additions & 2 deletions dist/angular-carousel.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "angular-carousel",
"description": "Angular Carousel - Mobile friendly touch carousel for AngularJS",
"version": "0.3.8",
"version": "0.3.9",
"homepage": "http://revolunet.github.com/angular-carousel",
"author": "Julien Bouquillon <[email protected]>",
"repository": {
Expand Down
5 changes: 2 additions & 3 deletions src/directives/rn-carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,8 @@

var defaultOptions = {
transitionType: iAttributes.rnCarouselTransition || 'slide',
transitionEasing: 'easeTo',
transitionDuration: 300,
/* do touchend trigger next slide automatically */
transitionEasing: iAttributes.rnCarouselEasing || 'easeTo',
transitionDuration: parseInt(iAttributes.rnCarouselDuration, 10) || 300,
isSequential: true,
autoSlideDuration: 3,
bufferSize: 5,
Expand Down

0 comments on commit 272ccc7

Please sign in to comment.