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

fix(nav): move null assignment of _onWillDismiss

Browse Source
This commit is contained in:
mattbryan9
2016-09-19 14:30:17 +01:00
committed by Adam Bradley
parent 001c1c9f2c
commit 35193c42c4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,6 +179,7 @@ export class ViewController {
this._onWillDismiss && this._onWillDismiss(data, role); this._onWillDismiss && this._onWillDismiss(data, role);
return this._nav.remove(this._nav.indexOf(this), 1, options).then(() => { return this._nav.remove(this._nav.indexOf(this), 1, options).then(() => {
this._onDidDismiss && this._onDidDismiss(data, role); this._onDidDismiss && this._onDidDismiss(data, role);
this._onWillDismiss = null;
return data; return data;
}); });
} }
@ -514,7 +515,7 @@ export class ViewController {
} }
} }
this._nav = this._cmp = this.instance = this._cntDir = this._cntRef = this._hdrDir = this._ftrDir = this._nb = this._onDidDismiss = this._onWillDismiss = null; this._nav = this._cmp = this.instance = this._cntDir = this._cntRef = this._hdrDir = this._ftrDir = this._nb = this._onDidDismiss = null;
} }
/** /**