From 0e63850a8f4b901a86ee129d56e48bab01af4d6c Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 12 May 2015 21:15:54 -0500
Subject: [PATCH] nav wip

---
 gulpfile.js                                   |  3 ---
 ionic/components/nav/nav-item.js              |  5 +++--
 ionic/components/nav/nav.js                   | 22 +++++++++++--------
 .../nav/test/basic/pages/first-page.js        |  7 +++---
 .../nav/test/basic/pages/third-page.js        |  2 +-
 ionic/transitions/none-transition.js          |  8 +++----
 6 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index e90bb91b73..709d337501 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -18,9 +18,6 @@ var watch = require('gulp-watch');
 var exec = require('child_process').exec;
 
 
-// !!! TEMP HACK !!!
-// first run ./update-angular.sh
-
 gulp.task('build', function() {
   runSequence(
     'clean',
diff --git a/ionic/components/nav/nav-item.js b/ionic/components/nav/nav-item.js
index e065543c5e..f263c3cba5 100644
--- a/ionic/components/nav/nav-item.js
+++ b/ionic/components/nav/nav-item.js
@@ -19,10 +19,11 @@ export class NavItem {
     let injector = null;
 
 
-    this.nav.loader.loadIntoExistingLocation(this.Class, this.nav.itemContent.elementRef, injector)
+    this.nav.loader.loadNextToExistingLocation(this.Class, this.nav.itemContent.elementRef, injector)
                    .then((componentRef) => {
 
-      console.log('Component loadIntoExistingLocation completed')
+      this.component = componentRef;
+      this.domElement = componentRef.location.domElement;
 
       resolve();
     });
diff --git a/ionic/components/nav/nav.js b/ionic/components/nav/nav.js
index fe22d37b03..1604e8a4e0 100644
--- a/ionic/components/nav/nav.js
+++ b/ionic/components/nav/nav.js
@@ -17,13 +17,13 @@ import {ToolbarContainer} from 'ionic/components/toolbar/toolbar';
 })
 @View({
   template: `
-  <header class="toolbar-container">
+  <header class="toolbar-container" style="display:none">
     <header-container></header-container>
   </header>
   <section class="nav-item-container">
     <content-container></content-container>
   </section>
-  <footer class="toolbar-container">
+  <footer class="toolbar-container" style="display:none">
     <footer-container></footer-container>
   </footer>
   `,
@@ -44,17 +44,19 @@ export class Nav extends NavBase {
 }
 
 
-@Directive({
+@Component({
   selector: 'header-container'
 })
 class HeaderContainer {
-  constructor(@Ancestor() nav: Nav) {
-    nav.itemHeader = this;
+  constructor(@Ancestor() nav: Nav, elementRef: ElementRef) {
+    nav.itemHeader = {
+      elementRef: elementRef
+    };
   }
 }
 
 
-@Directive({
+@Component({
   selector: 'content-container'
 })
 class ContentContainer {
@@ -66,11 +68,13 @@ class ContentContainer {
 }
 
 
-@Directive({
+@Component({
   selector: 'footer-container'
 })
 class FooterContainer {
-  constructor(@Ancestor() nav: Nav) {
-    nav.footerContainer = this;
+  constructor(@Ancestor() nav: Nav, elementRef: ElementRef) {
+    nav.footerContainer = {
+      elementRef: elementRef
+    };
   }
 }
diff --git a/ionic/components/nav/test/basic/pages/first-page.js b/ionic/components/nav/test/basic/pages/first-page.js
index e92dbfc161..be9c827a56 100644
--- a/ionic/components/nav/test/basic/pages/first-page.js
+++ b/ionic/components/nav/test/basic/pages/first-page.js
@@ -7,14 +7,13 @@ import {SecondPage} from './second-page'
 
 @Component()
 @View({
-  templateUrl: 'pages/first-page.html',
-  directives: []
+  templateUrl: 'pages/first-page.html'
 })
 export class FirstPage {
   constructor(
-    nav: NavController
+    //nav: NavController
   ) {
-    this.nav = nav;
+    //this.nav = nav;
   }
 
   push() {
diff --git a/ionic/components/nav/test/basic/pages/third-page.js b/ionic/components/nav/test/basic/pages/third-page.js
index ba2588dc00..a4337ed5b2 100644
--- a/ionic/components/nav/test/basic/pages/third-page.js
+++ b/ionic/components/nav/test/basic/pages/third-page.js
@@ -1,7 +1,7 @@
 import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
 import {View} from 'angular2/src/core/annotations_impl/view';
 
-import {NavController} from 'ionic/ionic'
+import {NavController} from 'ionic/ionic';
 
 
 @Component()
diff --git a/ionic/transitions/none-transition.js b/ionic/transitions/none-transition.js
index 4c85ed3597..cf6cc4e9f2 100644
--- a/ionic/transitions/none-transition.js
+++ b/ionic/transitions/none-transition.js
@@ -10,12 +10,12 @@ class NoneTransition {
     let leavingItem = navCtrl.getStagedLeavingItem();
 
     // show the entering item
-    enteringItem.navItem.domElement.style.display = 'block';
-    enteringItem.navItem.domElement.style.transform = 'translateX(0%)';
+    enteringItem.domElement.style.display = 'block';
+    enteringItem.domElement.style.transform = 'translateX(0%)';
 
     // hide the leaving item
-    if (leavingItem && leavingItem.navItem) {
-      leavingItem.navItem.domElement.style.display = '';
+    if (leavingItem && leavingItem.domElement) {
+      leavingItem.domElement.style.display = '';
     }
   }