javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
mhartington
2015-12-04 15:39:42 -05:00
parent f1d8d5fc14 28bb668d43
commit 9285e4fbd0
27 changed files with 112 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ionic/components/slides/slides.ts
View File

@ -64,6 +64,7 @@ import {Scroll} from '../scroll/scroll';
* @property {Any} [bounce] - whether the slides should bounce
* @property [pager] - add this property to enable the slide pager
* @property {Any} [slideChanged] - expression to evaluate when a slide has been changed
* @see {@link /docs/v2/components#slides Slides Component Docs}
*/
@Component({
selector: 'ion-slides',