From acd10c323269a8765a69ff2a31b6622619365cb0 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Wed, 13 May 2015 20:53:16 -0500 Subject: [PATCH] woot, toolbar/content same context! --- ionic/components/nav/nav-item.js | 8 +++++++- ionic/components/nav/test/basic/pages/first-page.html | 6 ++++-- ionic/components/nav/test/basic/pages/first-page.js | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ionic/components/nav/nav-item.js b/ionic/components/nav/nav-item.js index 7f403002c8..ec4e9dcd7e 100644 --- a/ionic/components/nav/nav-item.js +++ b/ionic/components/nav/nav-item.js @@ -42,7 +42,13 @@ export class NavItem { this.domElement.classList.add('nav-item'); this.domElement.setAttribute('data-nav-item-id', this.id); - let context = this.nav.contentElementRef + // TODO: talk to misko about correct way to set context + let context = { + boundElementIndex: 0, + parentView: { + _view: componentRef.location.parentView._view.componentChildViews[0] + } + }; for (let i = 0; i < this.headers.length; i++) { this.createHeader(this.headers[i], context, injector); diff --git a/ionic/components/nav/test/basic/pages/first-page.html b/ionic/components/nav/test/basic/pages/first-page.html index 4c61b1363e..ac4a0a9d41 100644 --- a/ionic/components/nav/test/basic/pages/first-page.html +++ b/ionic/components/nav/test/basic/pages/first-page.html @@ -1,12 +1,14 @@
-

First Page

+

First Page: Instance {{ val }}

- + + +

First Page: Instance {{ val }}

diff --git a/ionic/components/nav/test/basic/pages/first-page.js b/ionic/components/nav/test/basic/pages/first-page.js index 3982e252fc..1574c21036 100644 --- a/ionic/components/nav/test/basic/pages/first-page.js +++ b/ionic/components/nav/test/basic/pages/first-page.js @@ -15,6 +15,7 @@ export class FirstPage { nav: NavController ) { this.nav = nav; + this.val = Math.round(Math.random() * 8999) + 1000; } push() {