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

fix(angular): proxies

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-03-30 22:33:58 +02:00
parent cece447092
commit 230823915c
7 changed files with 276 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/components/nav/nav.tsx
View File

@ -23,7 +23,7 @@ import mdTransitionAnimation from './animations/md.transition';
@Component({
tag: 'ion-nav',
})
export class NavControllerBase implements NavOutlet {
export class Nav implements NavOutlet {
private _init = false;
private _queue: TransitionInstruction[] = [];
@ -470,7 +470,7 @@ export class NavControllerBase implements NavOutlet {
for (let i = 0; i < viewControllers.length; i++) {
const view = viewControllers[i];
view.delegate = ti.opts.delegate;
const nav = view._nav;
const nav = view.nav;
if (nav && nav !== this) {
throw new Error('inserted view was already inserted');
}
@ -663,13 +663,13 @@ export class NavControllerBase implements NavOutlet {
if (existingIndex > -1) {
// this view is already in the stack!!
// move it to its new location
assert(view._nav === this, 'view is not part of the nav');
assert(view.nav === this, 'view is not part of the nav');
this._views.splice(index, 0, this._views.splice(existingIndex, 1)[0]);
} else {
assert(!view._nav, 'nav is used');
assert(!view.nav, 'nav is used');
// this is a new view to add to the stack
// create the new entering view
view._setNav(this);
view.nav = this;
// insert the entering view into the correct index in the stack
this._views.splice(index, 0, view);