Merge branch 'pr/6655' into 2.0

This commit is contained in:
Brandy Carney
2016-05-31 12:27:27 -04:00
3 changed files with 12 additions and 2 deletions

View File

@ -882,13 +882,17 @@ export class Slide {
constructor( constructor(
elementRef: ElementRef, elementRef: ElementRef,
@Host() slides: Slides @Host() private slides: Slides
) { ) {
this.ele = elementRef.nativeElement; this.ele = elementRef.nativeElement;
this.ele.classList.add('swiper-slide'); this.ele.classList.add('swiper-slide');
slides.rapidUpdate(); slides.rapidUpdate();
} }
ngOnDestroy() {
this.slides.rapidUpdate();
}
} }
/** /**

View File

@ -19,6 +19,7 @@ class IntroPage {
continueText: string = "Skip"; continueText: string = "Skip";
startingIndex: number = 1; startingIndex: number = 1;
mySlideOptions; mySlideOptions;
showSlide: boolean = true;
constructor(private nav: NavController) { constructor(private nav: NavController) {
this.mySlideOptions = { this.mySlideOptions = {
@ -42,6 +43,10 @@ class IntroPage {
console.log("Slide move", slider); console.log("Slide move", slider);
} }
toggleLastSlide() {
this.showSlide = !this.showSlide;
}
skip() { skip() {
this.nav.push(MainPage); this.nav.push(MainPage);
} }

View File

@ -29,8 +29,9 @@
<li>There is no step 3</li> <li>There is no step 3</li>
</ol> </ol>
</div> </div>
<button (click)="toggleLastSlide()">Toggle Last Slide</button>
</ion-slide> </ion-slide>
<ion-slide> <ion-slide *ngIf="showSlide">
<h3>Any questions?</h3> <h3>Any questions?</h3>
</ion-slide> </ion-slide>
</ion-slides> </ion-slides>