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(navigation): move onWillDismiss and onDidDismiss, add unit tests

Browse Source
This commit is contained in:
mattbryan9
2016-09-22 21:37:24 -04:00
committed by Brandy Carney
parent 963e83514f
commit e26c425766
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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