From caaa5f9babb79d59be6f988407b9064c9f1ed627 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Wed, 16 Dec 2015 15:45:05 -0500 Subject: [PATCH] test(segment): adding navigation page for segment for testing toolbar in a toolbar references #614 --- ionic/components/segment/test/nav/index.ts | 36 +++++++++++++++++---- ionic/components/segment/test/nav/main.html | 9 +++--- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/ionic/components/segment/test/nav/index.ts b/ionic/components/segment/test/nav/index.ts index 6722218006..e74ded5595 100644 --- a/ionic/components/segment/test/nav/index.ts +++ b/ionic/components/segment/test/nav/index.ts @@ -1,19 +1,43 @@ -import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common'; - -import {App, Page} from 'ionic/ionic'; +import {Validators, Control, ControlGroup} from 'angular2/common'; +import {App, Page, NavController} from 'ionic/ionic'; @Page({ templateUrl: 'main.html', - providers: [FormBuilder], - directives: [FORM_DIRECTIVES] }) class SegmentPage { - constructor(fb: FormBuilder) { + constructor(nav: NavController) { + this.nav = nav; this.signInType = 'new'; } + + goToPage2() { + this.nav.push(SegmentPage2); + } } +@Page({ + template: ` + + + + Second Page + + + + +

Page 2

+
+ ` +}) +class SegmentPage2 { + constructor() { + } +} + + @App({ pages: [SegmentPage], template: `` diff --git a/ionic/components/segment/test/nav/main.html b/ionic/components/segment/test/nav/main.html index 8d94a1db3a..364e064ff6 100644 --- a/ionic/components/segment/test/nav/main.html +++ b/ionic/components/segment/test/nav/main.html @@ -3,7 +3,6 @@ Segment under Navbar - @@ -22,13 +21,13 @@ - + - + - + @@ -44,4 +43,6 @@ + +