javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 13:32:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Overlay dismiss fix (#9747)

Browse Source 
* fix(loading/toast): don't call to dismiss pages if the view is an overlay

fixes #9589

* test(overlay): add tests for loading and toast with view events

* test(datetime): add missing declaration
This commit is contained in:
Brandy Carney
2016-12-21 10:39:08 -05:00
committed by Justin Willis
parent fd9e406403
commit b1e5ea3aef
5 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/components/loading/test/basic/app-module.ts
View File

@ -1,5 +1,5 @@
import { Component, ViewEncapsulation, NgModule } from '@angular/core';
import { IonicApp, IonicModule, LoadingController, NavController } from '../../../..';
import { App, IonicApp, IonicModule, LoadingController, NavController } from '../../../..';
@Component({
@ -242,6 +242,18 @@ export class E2EPage {
}, 500);
}
presentLoadingDismissNav() {
this.loadingCtrl.create({
spinner: 'hide',
content: 'Loading 1 Please Wait...',
dismissOnPageChange: true
}).present();
setTimeout(() => {
this.navCtrl.push(Page2);
}, 500);
}
}
@Component({
@ -255,7 +267,7 @@ export class E2EPage {
<ion-footer>
<ion-toolbar>
<ion-buttons end>
<button ion-button (click)="goToPage3()">
<button ion-button icon-right (click)="goToPage3()">
Navigate
<ion-icon name="arrow-forward"></ion-icon>
</button>
@ -267,12 +279,6 @@ export class E2EPage {
export class Page2 {
constructor(public navCtrl: NavController) {}
ionViewDidLoad() {
setTimeout(() => {
this.navCtrl.push(Page3);
}, 1000);
}
goToPage3() {
this.navCtrl.push(Page3);
}
@ -298,6 +304,16 @@ export class Page3 {}
})
export class E2EApp {
root = E2EPage;
constructor(app: App) {
app.viewDidLeave.subscribe(ev => {
console.log('App didLeave');
});
app.viewWillLeave.subscribe(ev => {
console.log('App willLeave');
});
}
}
@NgModule({

1
src/components/loading/test/basic/main.html
View File

@ -21,6 +21,7 @@
<button ion-button block (click)="presentLoadingText()" color="dark">Content Only w/ Nav</button>
<button ion-button block (click)="presentLoadingMultiple()" color="danger">Multiple Loading</button>
<button ion-button block (click)="presentLoadingMultipleNav()" color="danger">Multiple Nav Loading</button>
<button ion-button block (click)="presentLoadingDismissNav()">Dismiss Page Change</button>
</ion-content>