diff --git a/ionic/components/nav/nav.js b/ionic/components/nav/nav.js index bbe64dd329..55825974f8 100644 --- a/ionic/components/nav/nav.js +++ b/ionic/components/nav/nav.js @@ -8,22 +8,15 @@ import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_compone import {Injector} from 'angular2/di'; import {ViewController} from '../view/view-controller'; -import {IonicComponent} from '../../config/component'; -@Component({ +@Directive({ selector: 'ion-nav', properties: [ 'initial' ], lifecycle: [onInit] }) -@View({ - template: ` - - `, - directives: [NavPaneAnchor] -}) export class Nav extends ViewController { constructor( @@ -34,9 +27,7 @@ export class Nav extends ViewController { injector: Injector ) { super(viewController, compiler, elementRef, loader, injector); - - this.domElement = elementRef.domElement; - this.config = Nav.config.invoke(this); + this.panes.setAnchor(elementRef); } onInit() { @@ -44,14 +35,3 @@ export class Nav extends ViewController { } } -new IonicComponent(Nav, {}); - - -@Directive({ - selector: 'template[pane-anchor]' -}) -class NavPaneAnchor { - constructor(@Parent() nav: Nav, elementRef: ElementRef) { - nav.panes.setAnchor(elementRef); - } -} diff --git a/ionic/components/nav/pane.js b/ionic/components/nav/pane.js index 7d151f6e53..5569ef1a42 100644 --- a/ionic/components/nav/pane.js +++ b/ionic/components/nav/pane.js @@ -92,9 +92,12 @@ export class PaneController { } - - -@Component({selector:'ion-pane'}) +@Component({ + selector:'ion-pane', + hostAttributes: { + 'class': 'nav nav-ios' + } +}) @View({ template: ` @@ -110,6 +113,7 @@ class Pane { this.sections = {}; nav.panes.add(this); } + addSection(sectionName, instance) { this.sections[sectionName] = instance; } diff --git a/ionic/components/view/view-item.js b/ionic/components/view/view-item.js index 9190989ea3..b9287945ff 100644 --- a/ionic/components/view/view-item.js +++ b/ionic/components/view/view-item.js @@ -12,7 +12,7 @@ export class ViewItem { constructor(viewController, ComponentClass, params = {}) { this.viewController = viewController; this.ComponentClass = ComponentClass; - this.params = new NavParams(this.params); + this.params = new NavParams(params); this.instance = null; this.state = 0;