From 1445013d0ace49c163cf69305a1492f0e38a790c Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Mon, 6 Jul 2015 18:15:12 -0500 Subject: [PATCH] Sink page --- ionic/components/app/test/sink/main.html | 2 +- ionic/components/app/test/sink/pages/action-menu.ts | 12 ++++++++---- ionic/components/app/test/sink/pages/aside.ts | 10 ++++++---- ionic/components/app/test/sink/pages/button.ts | 12 ++++++++---- ionic/components/app/test/sink/sink-page.ts | 12 ++++++++++++ 5 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 ionic/components/app/test/sink/sink-page.ts diff --git a/ionic/components/app/test/sink/main.html b/ionic/components/app/test/sink/main.html index f283a9c224..dd4bda0cde 100644 --- a/ionic/components/app/test/sink/main.html +++ b/ionic/components/app/test/sink/main.html @@ -1,4 +1,4 @@ - + Ionic 2.0 diff --git a/ionic/components/app/test/sink/pages/action-menu.ts b/ionic/components/app/test/sink/pages/action-menu.ts index 8420628a71..a00fff12f3 100644 --- a/ionic/components/app/test/sink/pages/action-menu.ts +++ b/ionic/components/app/test/sink/pages/action-menu.ts @@ -1,14 +1,16 @@ import {Component, Directive, View} from 'angular2/angular2'; -import {ActionMenu, NavbarTemplate, Navbar, NavController, Content} from 'ionic/ionic'; +import {IonicApp, ActionMenu, NavbarTemplate, Navbar, NavController, Content} from 'ionic/ionic'; +import {SinkPage} from '../sink-page'; @Component({ selector: 'ion-view' }) @View({ template: ` - Action Menu + Action Menu +

Action Menu

@@ -25,8 +27,10 @@ import {ActionMenu, NavbarTemplate, Navbar, NavController, Content} from 'ionic/ `, directives: [NavbarTemplate, Navbar, Content] }) -export class ActionMenuPage { - constructor(nav: NavController, actionMenu: ActionMenu) { +export class ActionMenuPage extends SinkPage { + constructor(app: IonicApp, nav: NavController, actionMenu: ActionMenu) { + super(app); + this.nav = nav; this.actionMenu = actionMenu; } diff --git a/ionic/components/app/test/sink/pages/aside.ts b/ionic/components/app/test/sink/pages/aside.ts index bd42fd41da..e213721d2e 100644 --- a/ionic/components/app/test/sink/pages/aside.ts +++ b/ionic/components/app/test/sink/pages/aside.ts @@ -1,15 +1,16 @@ import {Component, Directive, View} from 'angular2/angular2'; -import {List, Item, ActionMenu, Modal, ModalRef, +import {IonicApp, List, Item, ActionMenu, Modal, ModalRef, NavbarTemplate, Navbar, NavController, Content} from 'ionic/ionic'; +import {SinkPage} from '../sink-page'; @Component({ selector: 'ion-view' }) @View({ template: ` - Asides + Aside

Aside

@@ -31,8 +32,9 @@ import {List, Item, ActionMenu, Modal, ModalRef, `, directives: [NavbarTemplate, Navbar, Content, List, Item] }) -export class AsidePage { - constructor() { +export class AsidePage extends SinkPage { + constructor(app: IonicApp) { + super(app); } openMenu() { diff --git a/ionic/components/app/test/sink/pages/button.ts b/ionic/components/app/test/sink/pages/button.ts index 507134ce99..83f3e55c4c 100644 --- a/ionic/components/app/test/sink/pages/button.ts +++ b/ionic/components/app/test/sink/pages/button.ts @@ -1,14 +1,16 @@ import {Component, View, NgIf} from 'angular2/angular2'; -import {Routable, NavbarTemplate, Navbar, NavController, Content} from 'ionic/ionic'; +import {IonicApp, Routable, NavbarTemplate, Navbar, NavController, Content} from 'ionic/ionic'; +import {SinkPage} from '../sink-page'; @Component({ selector: 'ion-view' }) @View({ template: ` - Buttons + Buttons + @@ -58,8 +60,9 @@ import {Routable, NavbarTemplate, Navbar, NavController, Content} from 'ionic/io `, directives: [NavbarTemplate, Navbar, Content, NgIf] }) -export class ButtonPage { - constructor(nav: NavController) { +export class ButtonPage extends SinkPage { + constructor(app: IonicApp, nav: NavController) { + super(app); this.nav = nav; } @@ -72,6 +75,7 @@ export class ButtonPage { this.clicked = false; }, 500); } + } new Routable(ButtonPage, { diff --git a/ionic/components/app/test/sink/sink-page.ts b/ionic/components/app/test/sink/sink-page.ts new file mode 100644 index 0000000000..5bc8e62c44 --- /dev/null +++ b/ionic/components/app/test/sink/sink-page.ts @@ -0,0 +1,12 @@ +/** + * Simple wrapper page for the side menu toggle. + */ +export class SinkPage { + constructor(app: IonicApp) { + this.app = app; + } + toggleMenu() { + let aside = this.app.getComponent('mainMenu'); + aside.toggle(); + } +}