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

fix(viewcontroller): onDidDismiss() is always called

Browse Source 
fixes #8223
This commit is contained in:
Manu Mtz.-Almeida
2016-12-05 21:53:24 +01:00
committed by Adam Bradley
parent 66bbd24d8d
commit 68eb1b7cb5
6 changed files with 60 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/navigation/view-controller.ts
View File

@ -38,6 +38,8 @@ export class ViewController {
private _nb: Navbar;
private _onDidDismiss: Function;
private _onWillDismiss: Function;
private _dismissData: any;
private _dismissRole: any;
private _detached: boolean;
/**
@ -164,20 +166,16 @@ export class ViewController {
* @param {any} [role ]
* @param {NavOptions} NavOptions Options for the dismiss navigation.
* @returns {any} data Returns the data passed in, if any.
*
*/
dismiss(data?: any, role?: any, navOptions: NavOptions = {}): Promise<any> {
if (!this._nav) {
return Promise.resolve(false);
}
this._dismissData = data;
this._dismissRole = role;
let options = assign({}, this._leavingOpts, navOptions);
this._onWillDismiss && this._onWillDismiss(data, role);
return this._nav.removeView(this, options).then(() => {
this._onDidDismiss && this._onDidDismiss(data, role);
this._onDidDismiss = null;
return data;
});
const options = assign({}, this._leavingOpts, navOptions);
return this._nav.removeView(this, options).then(() => data);
}
/**
@ -489,9 +487,14 @@ export class ViewController {
* @private
* The view has is about to leave and no longer be the active view.
*/
_willLeave() {
_willLeave(willUnload: boolean) {
this.willLeave.emit(null);
this._lifecycle('WillLeave');
if (willUnload && this._onWillDismiss) {
this._onWillDismiss(this._dismissData, this._dismissRole);
this._onWillDismiss = null;
}
}
/**
@ -517,6 +520,11 @@ export class ViewController {
_willUnload() {
this.willUnload.emit(null);
this._lifecycle('WillUnload');
this._onDidDismiss && this._onDidDismiss(this._dismissData, this._dismissRole);
this._onDidDismiss = null;
this._dismissData = null;
this._dismissRole = null;
}
/**
@ -537,7 +545,7 @@ export class ViewController {
this._cmp.destroy();
}
this._nav = this._cmp = this.instance = this._cntDir = this._cntRef = this._hdrDir = this._ftrDir = this._nb = this._onWillDismiss = null;
this._nav = this._cmp = this.instance = this._cntDir = this._cntRef = this._hdrDir = this._ftrDir = this._nb = this._onDidDismiss = this._onWillDismiss = null;
}
/**