From 11ac26ee00e68eb3d10b07ca88ad96860a528f21 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Sat, 30 May 2015 22:29:39 -0500 Subject: [PATCH] Sink --- ionic/components/app/test/sink/index.js | 11 +- ionic/components/app/test/sink/main.html | 10 ++ .../app/test/sink/pages/action-menu.js | 11 +- .../components/app/test/sink/pages/button.js | 109 ++++++++++-------- ionic/components/app/test/sink/pages/list.js | 52 +++++++++ ionic/components/app/test/sink/pages/modal.js | 73 ++++++++++++ 6 files changed, 208 insertions(+), 58 deletions(-) create mode 100644 ionic/components/app/test/sink/pages/list.js create mode 100644 ionic/components/app/test/sink/pages/modal.js diff --git a/ionic/components/app/test/sink/index.js b/ionic/components/app/test/sink/index.js index dbd699b96c..40328c6885 100644 --- a/ionic/components/app/test/sink/index.js +++ b/ionic/components/app/test/sink/index.js @@ -10,12 +10,11 @@ import {Ionic, Nav, Toolbar, ViewContainer, Aside, List, Item, Content, Button} import {ButtonPage} from './pages/button' import {ActionMenuPage} from './pages/action-menu' +import {ModalPage} from './pages/modal' +import {ListPage} from './pages/list' @Component({ selector: 'ion-app', - properties: [ - 'aside: aside' - ] }) @View({ templateUrl: 'main.html', @@ -27,17 +26,17 @@ export class IonicApp { this.components = [ { title: 'Buttons', component: ButtonPage }, - { title: 'Action Menu', component: ActionMenuPage } + { title: 'Lists', component: ListPage }, + { title: 'Action Menu', component: ActionMenuPage }, + { title: 'Modal', component: ModalPage } ]; this.firstPage = ButtonPage } openPage(aside, component) { - console.log('Opening', aside, component); aside.close(); window.nav.clear().then(() => { - console.log('Cleared!'); window.nav.push(component.component, {}, { animate: false }); diff --git a/ionic/components/app/test/sink/main.html b/ionic/components/app/test/sink/main.html index e84c5c0558..e6915c3530 100644 --- a/ionic/components/app/test/sink/main.html +++ b/ionic/components/app/test/sink/main.html @@ -10,6 +10,16 @@ + +