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

fix(tabs): regression in nav-controller-base

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2016-10-19 01:14:27 +02:00
parent 5ad4c542be
commit d84d8a6471
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -521,6 +521,14 @@ export class NavControllerBase extends Ion implements NavController {
this._sbTrns = transition;
}
// transition start has to be registered before attaching the view to the DOM!
transition.registerStart(() => {
this._trnsStart(transition, enteringView, leavingView, opts, resolve);
if (transition.parent) {
transition.parent.start();
}
});
if (enteringView && enteringView._state === ViewState.INITIALIZED) {
// render the entering component in the DOM
// this would also render new child navs/views
@ -531,13 +539,6 @@ export class NavControllerBase extends Ion implements NavController {
console.debug('enteringView state is not INITIALIZED', enteringView);
}
transition.registerStart(() => {
this._trnsStart(transition, enteringView, leavingView, opts, resolve);
if (transition.parent) {
transition.parent.start();
}
});
if (!transition.hasChildren) {
// lowest level transition, so kick it off and let it bubble up to start all of them
transition.start();
@ -633,8 +634,9 @@ export class NavControllerBase extends Ion implements NavController {
// mainly for testing
let enteringName: string;
let leavingName: string;
let hasCompleted = transition.hasCompleted;
if (transition.hasCompleted) {
if (hasCompleted) {
// transition has completed (went from 0 to 1)
if (transition.enteringView) {
enteringName = transition.enteringView.name;
@ -671,7 +673,7 @@ export class NavControllerBase extends Ion implements NavController {
}
// congrats, we did it!
resolve(transition.hasCompleted, true, enteringName, leavingName, opts.direction);
resolve(hasCompleted, true, enteringName, leavingName, opts.direction);
}
_insertViewAt(view: ViewController, index: number) {