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

fix(nav): returning Promise<false> in canLeave / canEnter works as expected

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2016-11-04 20:18:09 +01:00
parent 63d495ae43
commit 5f1a86265c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/navigation/nav-controller-base.ts
View File

@ -485,8 +485,13 @@ export class NavControllerBase extends Ion implements NavController {
if (promises.length) { if (promises.length) {
// darn, async promises, gotta wait for them to resolve // darn, async promises, gotta wait for them to resolve
Promise.all(promises) Promise.all(promises)
.then(() => this._postViewInit(enteringView, leavingView, ti, resolve)) .then((values: any[]) => {
.catch(reject); if (values.some(result => result === false)) {
reject(`ionViewCanEnter rejected`);
} else {
this._postViewInit(enteringView, leavingView, ti, resolve);
}
}).catch(reject);
} else { } else {
// synchronous and all tests passed! let's move on already // synchronous and all tests passed! let's move on already
this._postViewInit(enteringView, leavingView, ti, resolve); this._postViewInit(enteringView, leavingView, ti, resolve);