From f524caded4cae637c438a46948295d8375d54828 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Fri, 24 Apr 2015 17:37:16 -0500 Subject: [PATCH] Bark park --- src/components/app/test/barkpark/main.js | 42 +++++-------------- .../app/test/barkpark/pages/app.html | 5 +-- .../app/test/barkpark/pages/tabs/home.html | 4 +- src/components/nav-pane/nav-pane.js | 12 +----- 4 files changed, 16 insertions(+), 47 deletions(-) diff --git a/src/components/app/test/barkpark/main.js b/src/components/app/test/barkpark/main.js index 8276f61dd6..70dc1a7494 100644 --- a/src/components/app/test/barkpark/main.js +++ b/src/components/app/test/barkpark/main.js @@ -1,5 +1,5 @@ import {bootstrap} from 'angular2/core' -import {Component, Template, Parent} from 'angular2/angular2' +import {For, Component, Template, Parent} from 'angular2/angular2' import {FormBuilder, Validators, FormDirectives, CongrolGroup} from 'angular2/forms'; import {Log} from 'ionic2/util' @@ -93,11 +93,15 @@ export class AppPage { @Component({ selector: 'stream-tab' }) @Template({ url: 'pages/tabs/home.html', - directives: [View, Content] + directives: [For, View, Content] }) class StreamTab { constructor(navPane: NavPane) { - this.navPane = navPane + this.navPane = navPane; + this.posts = [ + {'title': 'Just barked my first bark'}, + {'title': 'Went poopy' } + ]; } selectPost(post) { this.navPane.push(PostDetail, { @@ -122,36 +126,10 @@ class PostDetail { } } -// -// tab 2 -// -@Component({ selector: 't2p1' }) -@Template({ - inline: ` - - Left aside for Tab 2 Page 1 - - - -

Tab 2 Page 1.

- -
I have got an aside on the left. - -
-
- `, - directives: [View, Aside, Content] -}) -class Tab2Page1 { - constructor(navPane: NavPane) { - this.navPane = navPane - } - next() { - } -} +/** + * Main app entry point + */ @Component({ selector: '[ion-app]' }) @Template({ directives: [NavViewport], diff --git a/src/components/app/test/barkpark/pages/app.html b/src/components/app/test/barkpark/pages/app.html index b3d95cfd41..7c6387b86c 100644 --- a/src/components/app/test/barkpark/pages/app.html +++ b/src/components/app/test/barkpark/pages/app.html @@ -1,9 +1,6 @@ - - - - + diff --git a/src/components/app/test/barkpark/pages/tabs/home.html b/src/components/app/test/barkpark/pages/tabs/home.html index 3cf62d6dda..983f6a72c3 100644 --- a/src/components/app/test/barkpark/pages/tabs/home.html +++ b/src/components/app/test/barkpark/pages/tabs/home.html @@ -1,7 +1,9 @@ +

Posts

- + + {{post.title}}
diff --git a/src/components/nav-pane/nav-pane.js b/src/components/nav-pane/nav-pane.js index 361af0ecd6..01eb2a160c 100644 --- a/src/components/nav-pane/nav-pane.js +++ b/src/components/nav-pane/nav-pane.js @@ -1,23 +1,15 @@ -import {DynamicComponent, Parent, NgElement, bind} from 'angular2/angular2' +import {DynamicComponent, Parent, NgElement} from 'angular2/angular2' import {Optional} from 'angular2/src/di/annotations' import {NavViewport} from 'ionic2/components/nav-viewport/nav-viewport' import {Tab} from 'ionic2/components/tabs/tab' import {PrivateComponentLoader} from 'angular2/src/core/compiler/private_component_loader' import {PrivateComponentLocation} from 'angular2/src/core/compiler/private_component_location' -import {extend} from 'ionic2/util' - -class NavData = { - constructor(data = {}) { - extend(this, data) - } -} @DynamicComponent({ selector: '.nav-pane', bind: { item: 'item' - }, - services: [NavData] + } }) export class NavPane { constructor(