javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 12:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 3.0

Browse Source 
# Conflicts:
#	src/components/action-sheet/test/basic/pages/page-one/page-one.ts
#	src/components/alert/alert.ts
#	src/components/content/content.ts
#	src/components/datetime/datetime.ts
#	src/components/datetime/test/datetime.spec.ts
#	src/components/loading/loading.ts
#	src/components/modal/test/basic/app.module.ts
#	src/components/picker/picker-component.ts
#	src/components/toast/toast.ts
#	src/components/toolbar/toolbar.ios.scss
#	src/components/toolbar/toolbar.md.scss
#	src/components/toolbar/toolbar.wp.scss
#	src/components/virtual-scroll/test/basic/app.module.ts
#	src/util/util.ts
This commit is contained in:
Brandy Carney
2017-03-20 18:07:38 -04:00
parent 5c612aa33e 56364a0503
commit 042f698555
77 changed files with 1789 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/slides/slides.ts
View File

@ -139,7 +139,7 @@ import { ViewController } from '../../navigation/view-controller';
@Component({
selector: 'ion-slides',
template:
'<div class="swiper-container">' +
'<div class="swiper-container" [attr.dir]="_rtl? \'rtl\' : null">' +
'<div class="swiper-wrapper">' +
'<ng-content></ng-content>' +
'</div>' +
@ -249,6 +249,14 @@ export class Slides extends Ion {
}
private _pager = false;
/**
* @input {string} If dir attribute is equal to rtl, set interal _rtl to true;
*/
@Input()
set dir(val: string) {
this._rtl = (val.toLowerCase() === 'rtl');
}
/**
* @input {string} Type of pagination. Possible values are:
* `bullets`, `fraction`, `progress`. Default: `bullets`.