diff --git a/src/components/nav-view/nav-view.js b/src/components/nav-view/nav-view.js index ac401f9926..5c8537ae7e 100644 --- a/src/components/nav-view/nav-view.js +++ b/src/components/nav-view/nav-view.js @@ -1,5 +1,6 @@ import {Component, Template, Inject, Parent, NgElement} from 'angular2/angular2' import {ComponentConfig} from 'ionic2/config/component-config' +import {Log} from 'ionic2/util' @Component({ selector: 'ion-nav', @@ -24,11 +25,13 @@ export class NavView { * @param shouldAnimate whether to animate */ push(view, shouldAnimate) { - this.views.push(view) + this._views.push(view) if(shouldAnimate) { - this.animateIn(view) + this._animateIn(view) } + + Log.log('NAV: PUSH', view, 'Animate?', shouldAnimate) } /** @@ -37,10 +40,10 @@ export class NavView { * @param shouldAnimate whether to animate */ pop(shouldAnimate) { - last = stack.pop() + last = this._views.pop() if(shouldAnimate) { - this.animateOut(last) + this._animateOut(last) } return last @@ -58,6 +61,7 @@ export class NavView { // Animate a new view *in* _animateIn(view) { + } // Animate an old view *out* diff --git a/src/components/view/view.js b/src/components/view/view.js index 62cfb1a830..ad65289f30 100644 --- a/src/components/view/view.js +++ b/src/components/view/view.js @@ -24,5 +24,10 @@ export class View { constructor(@NgElement() ele:NgElement, @Parent() nav: NavView) { ele.domElement.classList.add('pane') console.log('View constructed', ele.domElement, nav); + + // TODO: Figure out better way to do this + if(nav) { + nav.push(this, true) + } } }