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

feat(viewcontroller): add onWillDismiss callback

Browse Source 
Fixed #6702
This commit is contained in:
Manu Mtz.-Almeida
2016-06-30 15:06:19 +02:00
committed by Adam Bradley
parent 1c882b31a5
commit ec99bfd019
13 changed files with 62 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/components/modal/test/basic/index.ts
View File

@@ -36,8 +36,13 @@ class E2EPage {
let modal = this.modalCtrl.create(ModalPassData, { userId: 8675309 });
modal.present();
modal.onDismiss((data: any) => {
modal.onWillDismiss((data: any) => {
console.log('WILL DISMISS with data', data);
console.timeEnd('modal');
});
modal.onDidDismiss((data: any) => {
console.log('modal data', data);
console.timeEnd('modal');
});
}
@@ -56,7 +61,7 @@ class E2EPage {
presentModalWithInputs() {
let modal = this.modalCtrl.create(ModalWithInputs);
modal.onDismiss((data: any) => {
modal.onDidDismiss((data: any) => {
console.log('Modal with inputs data:', data);
});
modal.present();
@@ -153,27 +158,28 @@ class ModalPassData {
}
submit() {
console.time('modal');
this.viewCtrl.dismiss(this.data);
}
ionViewLoaded(){
console.log("ModalPassData ionViewLoaded fired");
console.log('ModalPassData ionViewLoaded fired');
}
ionViewWillEnter(){
console.log("ModalPassData ionViewWillEnter fired");
console.log('ModalPassData ionViewWillEnter fired');
}
ionViewDidEnter(){
console.log("ModalPassData ionViewDidEnter fired");
console.log('ModalPassData ionViewDidEnter fired');
}
ionViewWillLeave(){
console.log("ModalPassData ionViewWillLeave fired");
console.log('ModalPassData ionViewWillLeave fired');
}
ionViewDidLeave(){
console.log("ModalPassData ionViewDidLeave fired");
console.log('ModalPassData ionViewDidLeave fired');
}
}
@@ -365,15 +371,15 @@ class ModalFirstPage {
}
ionViewLoaded(){
console.log("ModalFirstPage ionViewLoaded fired");
console.log('ModalFirstPage ionViewLoaded fired');
}
ionViewWillEnter(){
console.log("ModalFirstPage ionViewWillEnter fired");
console.log('ModalFirstPage ionViewWillEnter fired');
}
ionViewDidEnter(){
console.log("ModalFirstPage ionViewDidEnter fired");
console.log('ModalFirstPage ionViewDidEnter fired');
}
openActionSheet() {
@@ -446,15 +452,15 @@ class ModalSecondPage {
}
ionViewLoaded(){
console.log("ModalSecondPage ionViewLoaded");
console.log('ModalSecondPage ionViewLoaded');
}
ionViewWillEnter(){
console.log("ModalSecondPage ionViewWillEnter");
console.log('ModalSecondPage ionViewWillEnter');
}
ionViewDidEnter(){
console.log("ModalSecondPage ionViewDidEnter");
console.log('ModalSecondPage ionViewDidEnter');
}
}