View pushes to nav

This commit is contained in:
Max Lynch
2015-03-29 10:58:27 -06:00
parent fa07c5175b
commit 1c15080ab0
2 changed files with 13 additions and 4 deletions

View File

@ -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*

View File

@ -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)
}
}
}