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

chore(nav): return transition promises

Browse Source
This commit is contained in:
Adam Bradley
2015-11-02 12:01:35 -06:00
parent b8db33ebb8
commit ef19d7ca61
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ionic/components/nav/nav-controller.ts
View File

@ -236,10 +236,7 @@ export class NavController extends Ion {
}
// start the transition
this.transition(enteringView, leavingView, opts, () => {
// transition completed, destroy the leaving view
resolve();
});
this.transition(enteringView, leavingView, opts, resolve);
} else {
this._transComplete();
@ -261,14 +258,14 @@ export class NavController extends Ion {
// Get the target index of the view to pop to
let viewIndex = this._views.indexOf(view);
let targetIndex = viewIndex + 1;
let resolve;
let promise = new Promise(res => { resolve = res; });
// Don't pop to the view if it wasn't found, or the target is beyond the view list
if(viewIndex < 0 || targetIndex > this._views.length - 1) {
resolve();
return;
if (viewIndex < 0 || targetIndex > this._views.length - 1) {
return Promise.resolve();
}
let resolve;
let promise = new Promise(res => { resolve = res; });
opts.direction = opts.direction || 'back';
// get the views to auto remove without having to do a transiton for each
@ -289,9 +286,7 @@ export class NavController extends Ion {
this.router.stateChange('pop', enteringView);
}
this.transition(enteringView, leavingView, opts, () => {
resolve();
});
this.transition(enteringView, leavingView, opts, resolve);
return promise;
}
@ -301,7 +296,7 @@ export class NavController extends Ion {
* @param opts extra animation options
*/
popToRoot(opts = {}) {
this._popTo(this.first());
return this._popTo(this.first(), opts);
}
/**