From 6e9087534d3bb202e212a03d2d9304d4d30d15cf Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Tue, 31 May 2016 15:49:12 -0500 Subject: [PATCH] test(bootstrap): update to use ionicBootstrap --- .../action-sheet/test/basic/index.ts | 15 +++--- src/components/alert/test/basic/index.ts | 20 ++++---- src/components/alert/test/dismiss/index.ts | 18 ++++---- src/components/app/test/animations/index.ts | 24 +++++----- src/components/app/test/app.spec.ts | 6 +-- src/components/app/test/cordova/index.ts | 46 ++++++++----------- src/components/app/test/gestures/index.ts | 15 +++--- src/components/app/test/storage/index.ts | 16 +++++-- src/components/app/test/typography/index.ts | 9 ++-- src/components/badge/test/basic/index.ts | 12 ++--- src/components/button/test/basic/index.ts | 18 +++++--- src/components/button/test/block/index.ts | 9 ++-- src/components/button/test/clear/index.ts | 9 ++-- src/components/button/test/dynamic/index.ts | 9 ++-- src/components/button/test/fab/index.ts | 9 ++-- src/components/button/test/full/index.ts | 9 ++-- src/components/button/test/icons/index.ts | 9 ++-- src/components/button/test/outline/index.ts | 9 ++-- src/components/button/test/raised/index.ts | 21 ++------- src/components/button/test/round/index.ts | 7 ++- src/components/button/test/sizes/index.ts | 9 ++-- src/components/card/test/advanced/index.ts | 9 ++-- src/components/card/test/basic/index.ts | 9 ++-- src/components/card/test/images/index.ts | 9 ++-- src/components/card/test/list/index.ts | 9 ++-- src/components/card/test/map/index.ts | 9 ++-- src/components/card/test/social/index.ts | 9 ++-- src/components/checkbox/test/basic/index.ts | 21 +++------ src/components/chip/test/basic/index.ts | 12 ++--- src/components/chip/test/delete/index.ts | 12 +++-- src/components/chip/test/icon/index.ts | 12 ++--- src/components/chip/test/image/index.ts | 12 ++--- src/components/datetime/test/basic/index.ts | 15 +++--- src/components/grid/test/alignment/index.ts | 9 ++-- src/components/grid/test/basic/index.ts | 9 ++-- src/components/grid/test/full/index.ts | 9 ++-- src/components/icon/test/basic/index.ts | 35 +++++++------- .../infinite-scroll/infinite-scroll.ts | 4 +- .../infinite-scroll/test/basic/index.ts | 20 ++++---- .../infinite-scroll/test/short-list/index.ts | 9 ++-- .../input/test/clear-input/index.ts | 15 +++--- .../input/test/fixed-inline-labels/index.ts | 9 ++-- .../input/test/floating-labels/index.ts | 22 ++++----- .../input/test/form-inputs/index.ts | 15 +++--- .../input/test/inline-labels/index.ts | 11 +++-- .../input/test/input-focus/index.ts | 26 ++++++----- .../input/test/inset-inputs/index.ts | 9 ++-- .../input/test/placeholder-labels/index.ts | 9 ++-- .../input/test/stacked-labels/index.ts | 22 +++++---- src/components/item/test/buttons/index.ts | 11 +++-- src/components/item/test/dividers/index.ts | 9 ++-- src/components/item/test/groups/index.ts | 26 +++++------ src/components/item/test/icons/index.ts | 9 ++-- src/components/item/test/images/index.ts | 9 ++-- src/components/item/test/media/index.ts | 9 ++-- src/components/item/test/sliding/index.ts | 16 +++---- src/components/item/test/text/index.ts | 9 ++-- src/components/list/test/headers/index.ts | 9 ++-- src/components/list/test/inset/index.ts | 9 ++-- src/components/list/test/no-lines/index.ts | 9 ++-- .../list/test/repeat-headers/index.ts | 21 +++++---- src/components/list/test/sticky/index.ts | 21 +++++---- src/components/loading/test/basic/index.ts | 13 ++++-- src/components/loading/test/tabs/index.ts | 13 ++++-- src/components/menu/test/basic/index.ts | 18 ++++---- src/components/menu/test/basic/main.html | 2 +- .../menu/test/disable-swipe/index.ts | 16 +++---- .../menu/test/disable-swipe/main.html | 2 +- .../menu/test/enable-disable/index.ts | 14 +++--- src/components/menu/test/multiple/index.ts | 15 +++--- src/components/menu/test/overlay/index.ts | 14 +++--- src/components/menu/test/push/index.ts | 14 +++--- src/components/menu/test/reveal/index.ts | 14 +++--- src/components/modal/test/basic/index.ts | 31 ++++++------- src/components/nav/test/basic/index.ts | 21 ++++----- src/components/nav/test/init-async/index.ts | 9 ++-- src/components/nav/test/insert-views/index.ts | 33 ++++++------- src/components/nav/test/memory/index.ts | 17 ++++--- src/components/nav/test/nested/index.ts | 24 +++++----- src/components/nav/test/routing/index.ts | 16 ++++--- src/components/picker/test/basic/index.ts | 15 +++--- src/components/popover/test/basic/index.ts | 20 ++++---- src/components/radio/test/basic/index.ts | 7 ++- src/components/refresher/test/basic/index.ts | 7 ++- src/components/scroll/test/basic/index.ts | 9 ++-- .../searchbar/test/floating/index.ts | 16 +++---- src/components/searchbar/test/nav/index.ts | 20 ++++---- .../searchbar/test/toolbar/index.ts | 12 ++--- src/components/segment/test/basic/index.ts | 22 ++++----- src/components/segment/test/nav/index.ts | 23 +++++----- src/components/segment/test/swipe/index.ts | 16 +++---- .../select/test/multiple-value/index.ts | 15 +++--- .../select/test/single-value/index.ts | 20 ++++---- .../show-hide-when/test/basic/index.ts | 28 +++++------ src/components/slides/test/basic/index.ts | 10 ++-- .../slides/test/controller/index.ts | 15 +++--- src/components/slides/test/intro/index.ts | 28 ++++++----- src/components/slides/test/loop/index.ts | 11 +++-- src/components/slides/test/scroll/index.ts | 15 +++--- src/components/spinner/test/basic/index.ts | 7 ++- src/components/tabs/test/advanced/index.ts | 36 ++++++++------- src/components/tabs/test/badges/index.ts | 13 +++--- src/components/tabs/test/basic/index.ts | 19 ++++---- src/components/tabs/test/colors/index.ts | 17 +++---- src/components/tabs/test/ghost/index.ts | 46 ++++++++----------- .../tabs/test/tab-bar-scenarios/index.ts | 17 +++---- src/components/toast/test/basic/index.ts | 17 +++---- src/components/toggle/test/basic/index.ts | 20 +++----- src/components/toolbar/test/colors/index.ts | 9 ++-- .../toolbar/test/scenarios/index.ts | 9 ++-- .../virtual-scroll/test/basic/index.ts | 15 +++--- .../virtual-scroll/test/cards/index.ts | 15 +++--- .../test/image-gallery/index.ts | 15 +++--- .../test/variable-size/index.ts | 14 +++--- 114 files changed, 901 insertions(+), 800 deletions(-) diff --git a/src/components/action-sheet/test/basic/index.ts b/src/components/action-sheet/test/basic/index.ts index 33fbc0be28..34da55c8b4 100644 --- a/src/components/action-sheet/test/basic/index.ts +++ b/src/components/action-sheet/test/basic/index.ts @@ -1,7 +1,8 @@ -import {App, Page, ActionSheet, Alert, Modal, NavController, ViewController, Platform} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap, ActionSheet, Alert, Modal, NavController, ViewController, Platform} from '../../../../../src'; -@Page({ +@Component({ templateUrl: 'main.html' }) class E2EPage { @@ -151,7 +152,7 @@ class E2EPage { } -@Page({ +@Component({ template: ` @@ -173,11 +174,11 @@ class ModalPage { } -@App({ +@Component({ template: '' }) class E2EApp { - constructor() { - this.root = E2EPage; - } + root = E2EPage; } + +ionicBootstrap(E2EApp); diff --git a/src/components/alert/test/basic/index.ts b/src/components/alert/test/basic/index.ts index 45ffb5e687..ef686e2a6e 100644 --- a/src/components/alert/test/basic/index.ts +++ b/src/components/alert/test/basic/index.ts @@ -1,7 +1,8 @@ -import {App, Page, Alert, Modal, NavController, ViewController} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap, Alert, Modal, NavController, ViewController} from '../../../../../src'; -@Page({ +@Component({ templateUrl: 'main.html' }) class E2EPage { @@ -9,6 +10,10 @@ class E2EPage { testPromptOpen: boolean = false; testConfirmResult: string = ''; testPromptResult: string = ''; + testRadioOpen: boolean = false; + testRadioResult: string = ''; + testCheckboxOpen: boolean = false; + testCheckboxResult: string = ''; constructor(private nav: NavController) { } @@ -288,7 +293,7 @@ class E2EPage { } } -@Page({ +@Component({ template: ` @@ -310,12 +315,11 @@ class ModalPage { } -@App({ +@Component({ template: '' }) class E2EApp { - root; - constructor() { - this.root = E2EPage; - } + root = E2EPage; } + +ionicBootstrap(E2EApp); diff --git a/src/components/alert/test/dismiss/index.ts b/src/components/alert/test/dismiss/index.ts index cfd9fdb318..a479c27bf7 100644 --- a/src/components/alert/test/dismiss/index.ts +++ b/src/components/alert/test/dismiss/index.ts @@ -1,8 +1,9 @@ -import { Alert, Loading, NavController, App, Page } from '../../../../index'; -import { FORM_DIRECTIVES, FormBuilder, ControlGroup, Validators } from '@angular/common'; +import {Component} from '@angular/core'; +import {ionicBootstrap, Alert, Loading, NavController} from '../../../../index'; +import {FormBuilder, ControlGroup, Validators} from '@angular/common'; -@Page({ +@Component({ templateUrl: 'main.html' }) export class E2EPage { @@ -32,7 +33,7 @@ export class E2EPage { } } -@Page({ +@Component({ template: ` Another Page @@ -153,12 +154,11 @@ class AnotherPage { } -@App({ +@Component({ template: '' }) class E2EApp { - root; - constructor() { - this.root = E2EPage; - } + root = E2EPage; } + +ionicBootstrap(E2EApp); diff --git a/src/components/app/test/animations/index.ts b/src/components/app/test/animations/index.ts index 060b7d2fda..49f43d2716 100644 --- a/src/components/app/test/animations/index.ts +++ b/src/components/app/test/animations/index.ts @@ -1,18 +1,19 @@ -import {App, Page, Animation, IonicApp} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap, Config, Animation} from '../../../../../src'; -@Page({ +@Component({ templateUrl: 'main.html' }) class E2EPage { duration; easing; - constructor(app: IonicApp) { + constructor(config: Config) { this.duration = '1000'; this.easing = 'ease-in-out'; - console.log('isProd', app.isProd()); + console.log('isProd', config.prodMode); } playGreen() { @@ -54,14 +55,13 @@ class E2EPage { } -@App({ - template: '', - prodMode: true +@Component({ + template: '' }) class E2EApp { - root; - - constructor() { - this.root = E2EPage; - } + root = E2EPage; } + +ionicBootstrap(E2EApp, null, { + prodMode: true +}); diff --git a/src/components/app/test/app.spec.ts b/src/components/app/test/app.spec.ts index 58e6d59000..6507987a7f 100644 --- a/src/components/app/test/app.spec.ts +++ b/src/components/app/test/app.spec.ts @@ -1,4 +1,4 @@ -import {IonicApp, Nav, Tabs, Tab, NavOptions, Config, ViewController, Platform} from '../../../../src'; +import {App, Nav, Tabs, Tab, NavOptions, Config, ViewController, Platform} from '../../../../src'; export function run() { @@ -86,7 +86,7 @@ describe('IonicApp', () => { }); - var app: IonicApp; + var app: App; var config: Config; var platform: Platform; var _cd: any; @@ -106,7 +106,7 @@ describe('IonicApp', () => { beforeEach(() => { config = new Config(); platform = new Platform(); - app = new IonicApp(config, null, platform); + app = new App(config, null, platform); _cd = { reattach: function(){}, detach: function(){} diff --git a/src/components/app/test/cordova/index.ts b/src/components/app/test/cordova/index.ts index 6d9b94ff77..6f47fb5689 100644 --- a/src/components/app/test/cordova/index.ts +++ b/src/components/app/test/cordova/index.ts @@ -1,7 +1,8 @@ -import {App, NavController, Page, IonicApp, Modal, ViewController} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap, NavController, Modal, ViewController} from '../../../../../src'; -@Page({ +@Component({ template: ` This is a modal @@ -21,9 +22,7 @@ import {App, NavController, Page, IonicApp, Modal, ViewController} from '../../. ` }) class MyModal { - constructor(private viewCtrl: ViewController) { - - } + constructor(private viewCtrl: ViewController) {} dismissModal() { this.viewCtrl.dismiss(); @@ -31,7 +30,7 @@ class MyModal { } -@Page({ +@Component({ templateUrl: 'page1.html' }) class Page1 { @@ -46,16 +45,14 @@ class Page1 { } -@Page({ +@Component({ templateUrl: 'page2.html' }) class Page2 { page1 = Page1; page3 = Page3; - constructor(private nav: NavController) { - - } + constructor(private nav: NavController) {} openModal() { let modal = Modal.create(MyModal); @@ -64,13 +61,11 @@ class Page2 { } -@Page({ +@Component({ templateUrl: 'page3.html' }) class Page3 { - constructor(private nav: NavController) { - - } + constructor(private nav: NavController) {} goBack() { this.nav.pop(); @@ -78,7 +73,7 @@ class Page3 { } -@Page({ +@Component({ template: ` This is a tab page @@ -97,13 +92,11 @@ class Page3 { ` }) class TabPage1 { - constructor(private nav: NavController) { - - } + constructor(private nav: NavController) {} } -@Page({ +@Component({ templateUrl: 'tabs.html' }) class TabsPage { @@ -111,9 +104,7 @@ class TabsPage { tab2Root = Page2; tab3Root = Page3; - constructor(private nav: NavController) { - - } + constructor(private nav: NavController) {} goBack() { this.nav.pop(); @@ -121,12 +112,13 @@ class TabsPage { } -@App({ - templateUrl: `./app.html`, - config: { - statusbarPadding: true - } +@Component({ + templateUrl: `./app.html` }) class E2EApp { root = Page1; } + +ionicBootstrap(E2EApp, null, { + statusbarPadding: true +}); diff --git a/src/components/app/test/gestures/index.ts b/src/components/app/test/gestures/index.ts index 735d1a2e01..9d3063b10f 100644 --- a/src/components/app/test/gestures/index.ts +++ b/src/components/app/test/gestures/index.ts @@ -1,7 +1,8 @@ -import {App, Page} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@Page({ +@Component({ templateUrl: 'main.html' }) class E2EPage { @@ -13,13 +14,11 @@ class E2EPage { } -@App({ +@Component({ template: '' }) class E2EApp { - root; - - constructor() { - this.root = E2EPage; - } + root = E2EPage; } + +ionicBootstrap(E2EApp); diff --git a/src/components/app/test/storage/index.ts b/src/components/app/test/storage/index.ts index 180640553c..678de42e71 100644 --- a/src/components/app/test/storage/index.ts +++ b/src/components/app/test/storage/index.ts @@ -1,26 +1,32 @@ import {Component} from '@angular/core'; import {Control, ControlGroup} from '@angular/common'; +import {ionicBootstrap, Storage, LocalStorage, SqlStorage} from '../../../../../src'; -import {App, Storage, LocalStorage, SqlStorage} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class IonicApp { +class E2EApp { + local: Storage; + sql: Storage; + constructor() { this.local = new Storage(LocalStorage); this.sql = new Storage(SqlStorage); } + getLocal() { this.local.get('name').then(value => { alert('Your name is: ' + value); }); } + setLocal() { let name = prompt('Your name?'); this.local.set('name', name); } + removeLocal() { this.local.remove('name'); } @@ -32,12 +38,16 @@ class IonicApp { console.error('Unable to get item from SQL db:', errResult); }); } + setSql() { let name = prompt('Your name?'); this.sql.set('name', name); } + removeSql() { this.sql.remove('name'); } } + +ionicBootstrap(E2EApp); diff --git a/src/components/app/test/typography/index.ts b/src/components/app/test/typography/index.ts index 2cb2ad0b25..5d9d40065f 100644 --- a/src/components/app/test/typography/index.ts +++ b/src/components/app/test/typography/index.ts @@ -1,11 +1,14 @@ -import {App, IonicApp} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap, App} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) class E2EApp { - constructor(app: IonicApp) { + constructor(app: App) { app.setTitle('Basic Buttons'); } } + +ionicBootstrap(E2EApp); diff --git a/src/components/badge/test/basic/index.ts b/src/components/badge/test/basic/index.ts index a1ab440649..6fe29fcc36 100644 --- a/src/components/badge/test/basic/index.ts +++ b/src/components/badge/test/basic/index.ts @@ -1,10 +1,10 @@ -import {App, IonicApp} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { - constructor(app: IonicApp) { - } -} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/button/test/basic/index.ts b/src/components/button/test/basic/index.ts index 1dd24fc8b5..4f2dfa7979 100644 --- a/src/components/button/test/basic/index.ts +++ b/src/components/button/test/basic/index.ts @@ -1,15 +1,17 @@ -import {App, IonicApp} from '../../../../../src'; +import {Component} from '@angular/core'; +import {App, ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { - constructor(app: IonicApp) { - app.setTitle('Basic Buttons'); +class E2EPage { + btnColor; + testingColors = ['primary', 'secondary', 'danger', 'dark']; + testingColorIndex = 0; - this.testingColors = ['primary', 'secondary', 'danger', 'dark']; - this.testingColorIndex = 0; + constructor(app: App) { + app.setTitle('Basic Buttons'); this.chgColor(); } @@ -19,3 +21,5 @@ class E2EApp { this.testingColorIndex = (this.testingColorIndex >= this.testingColors.length - 1 ? 0 : this.testingColorIndex + 1); } } + +ionicBootstrap(E2EPage); diff --git a/src/components/button/test/block/index.ts b/src/components/button/test/block/index.ts index e7471391fb..41b68396b9 100644 --- a/src/components/button/test/block/index.ts +++ b/src/components/button/test/block/index.ts @@ -1,13 +1,16 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { +class E2EPage { blockButton = true; toggleBlock() { this.blockButton = !this.blockButton; } } + +ionicBootstrap(E2EPage); diff --git a/src/components/button/test/clear/index.ts b/src/components/button/test/clear/index.ts index a05a913068..b829dcb948 100644 --- a/src/components/button/test/clear/index.ts +++ b/src/components/button/test/clear/index.ts @@ -1,13 +1,16 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { +class E2EPage { clearButton = true; toggleClear() { this.clearButton = !this.clearButton; } } + +ionicBootstrap(E2EPage); diff --git a/src/components/button/test/dynamic/index.ts b/src/components/button/test/dynamic/index.ts index d31c135010..ae6b4d0794 100644 --- a/src/components/button/test/dynamic/index.ts +++ b/src/components/button/test/dynamic/index.ts @@ -1,10 +1,11 @@ -import {App, IonicApp} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { +class E2EPage { isDestructive: boolean; isSecondary: boolean; isCustom: boolean; @@ -50,3 +51,5 @@ class E2EApp { this.isClicked = !this.isClicked; } } + +ionicBootstrap(E2EPage); diff --git a/src/components/button/test/fab/index.ts b/src/components/button/test/fab/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/button/test/fab/index.ts +++ b/src/components/button/test/fab/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/button/test/full/index.ts b/src/components/button/test/full/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/button/test/full/index.ts +++ b/src/components/button/test/full/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/button/test/icons/index.ts b/src/components/button/test/icons/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/button/test/icons/index.ts +++ b/src/components/button/test/icons/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/button/test/outline/index.ts b/src/components/button/test/outline/index.ts index d93316646c..fb12bd391d 100644 --- a/src/components/button/test/outline/index.ts +++ b/src/components/button/test/outline/index.ts @@ -1,13 +1,16 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { +class E2EPage { outlineButton = true; toggleOutline() { this.outlineButton = !this.outlineButton; } } + +ionicBootstrap(E2EPage); diff --git a/src/components/button/test/raised/index.ts b/src/components/button/test/raised/index.ts index 1dd24fc8b5..6fe29fcc36 100644 --- a/src/components/button/test/raised/index.ts +++ b/src/components/button/test/raised/index.ts @@ -1,21 +1,10 @@ -import {App, IonicApp} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { - constructor(app: IonicApp) { - app.setTitle('Basic Buttons'); +class E2EPage {} - this.testingColors = ['primary', 'secondary', 'danger', 'dark']; - this.testingColorIndex = 0; - this.chgColor(); - } - - chgColor() { - this.btnColor = this.testingColors[this.testingColorIndex]; - console.log('dynamic btnColor', this.btnColor); - this.testingColorIndex = (this.testingColorIndex >= this.testingColors.length - 1 ? 0 : this.testingColorIndex + 1); - } -} +ionicBootstrap(E2EPage); diff --git a/src/components/button/test/round/index.ts b/src/components/button/test/round/index.ts index 5fe8f60eaa..54b21c5cd9 100644 --- a/src/components/button/test/round/index.ts +++ b/src/components/button/test/round/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) class E2EApp {} + +ionicBootstrap(E2EApp); diff --git a/src/components/button/test/sizes/index.ts b/src/components/button/test/sizes/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/button/test/sizes/index.ts +++ b/src/components/button/test/sizes/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/card/test/advanced/index.ts b/src/components/card/test/advanced/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/card/test/advanced/index.ts +++ b/src/components/card/test/advanced/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/card/test/basic/index.ts b/src/components/card/test/basic/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/card/test/basic/index.ts +++ b/src/components/card/test/basic/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/card/test/images/index.ts b/src/components/card/test/images/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/card/test/images/index.ts +++ b/src/components/card/test/images/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/card/test/list/index.ts b/src/components/card/test/list/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/card/test/list/index.ts +++ b/src/components/card/test/list/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/card/test/map/index.ts b/src/components/card/test/map/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/card/test/map/index.ts +++ b/src/components/card/test/map/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/card/test/social/index.ts b/src/components/card/test/social/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/card/test/social/index.ts +++ b/src/components/card/test/social/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/checkbox/test/basic/index.ts b/src/components/checkbox/test/basic/index.ts index f8949bb2c8..34197b7fa8 100644 --- a/src/components/checkbox/test/basic/index.ts +++ b/src/components/checkbox/test/basic/index.ts @@ -1,21 +1,12 @@ -import {App} from '../../../../../src'; -import { - Control, - ControlGroup, - NgForm, - Validators, - NgControl, - ControlValueAccessor, - NgControlName, - NgFormModel, - FormBuilder -} from '@angular/common'; +import {Component} from '@angular/core'; +import {Control, ControlGroup} from '@angular/common'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { +class E2EPage { fruitsForm: ControlGroup; grapeDisabled: boolean; grapeChecked: boolean; @@ -61,3 +52,5 @@ class E2EApp { ev.preventDefault(); } } + +ionicBootstrap(E2EPage); diff --git a/src/components/chip/test/basic/index.ts b/src/components/chip/test/basic/index.ts index a1ab440649..6fe29fcc36 100644 --- a/src/components/chip/test/basic/index.ts +++ b/src/components/chip/test/basic/index.ts @@ -1,10 +1,10 @@ -import {App, IonicApp} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { - constructor(app: IonicApp) { - } -} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/chip/test/delete/index.ts b/src/components/chip/test/delete/index.ts index 9ae7ce3f0b..58ca58c460 100644 --- a/src/components/chip/test/delete/index.ts +++ b/src/components/chip/test/delete/index.ts @@ -1,14 +1,16 @@ -import {App, IonicApp} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { - constructor(app: IonicApp) { - } +class E2EPage { deleteClicked() { console.log('deleteClicked'); } + } + +ionicBootstrap(E2EPage); diff --git a/src/components/chip/test/icon/index.ts b/src/components/chip/test/icon/index.ts index a1ab440649..6fe29fcc36 100644 --- a/src/components/chip/test/icon/index.ts +++ b/src/components/chip/test/icon/index.ts @@ -1,10 +1,10 @@ -import {App, IonicApp} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { - constructor(app: IonicApp) { - } -} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/chip/test/image/index.ts b/src/components/chip/test/image/index.ts index a1ab440649..6fe29fcc36 100644 --- a/src/components/chip/test/image/index.ts +++ b/src/components/chip/test/image/index.ts @@ -1,10 +1,10 @@ -import {App, IonicApp} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { - constructor(app: IonicApp) { - } -} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/datetime/test/basic/index.ts b/src/components/datetime/test/basic/index.ts index 886b0a632d..0b80e5e0ad 100644 --- a/src/components/datetime/test/basic/index.ts +++ b/src/components/datetime/test/basic/index.ts @@ -1,7 +1,8 @@ -import {App, Page} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@Page({ +@Component({ templateUrl: 'main.html' }) class E2EPage { @@ -29,13 +30,11 @@ class E2EPage { } -@App({ +@Component({ template: '' }) class E2EApp { - root; - - constructor() { - this.root = E2EPage; - } + root = E2EPage; } + +ionicBootstrap(E2EApp); diff --git a/src/components/grid/test/alignment/index.ts b/src/components/grid/test/alignment/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/grid/test/alignment/index.ts +++ b/src/components/grid/test/alignment/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/grid/test/basic/index.ts b/src/components/grid/test/basic/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/grid/test/basic/index.ts +++ b/src/components/grid/test/basic/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/grid/test/full/index.ts b/src/components/grid/test/full/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/grid/test/full/index.ts +++ b/src/components/grid/test/full/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/icon/test/basic/index.ts b/src/components/icon/test/basic/index.ts index 847a52bdc6..78f1905263 100644 --- a/src/components/icon/test/basic/index.ts +++ b/src/components/icon/test/basic/index.ts @@ -1,23 +1,24 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; - -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { - constructor() { - this.homeIcon = 'home'; - this.isActive = false; +class E2EPage { + homeIcon = 'home'; + isActive = false; + iconIndex = 0; + icons = [ + 'home', + 'star', + 'ios-alert', + 'ios-alert-outline', + 'md-alert', + 'logo-apple' + ]; + btnIcon; - this.iconIndex = 0; - this.icons = [ - 'home', - 'star', - 'ios-alert', - 'ios-alert-outline', - 'md-alert', - 'logo-apple' - ]; + constructor() { this.btnIcon = this.icons[0]; } @@ -29,3 +30,5 @@ class E2EApp { this.btnIcon = this.icons[this.iconIndex]; } } + +ionicBootstrap(E2EPage); diff --git a/src/components/infinite-scroll/infinite-scroll.ts b/src/components/infinite-scroll/infinite-scroll.ts index 11e5bb4715..cac5ff5312 100644 --- a/src/components/infinite-scroll/infinite-scroll.ts +++ b/src/components/infinite-scroll/infinite-scroll.ts @@ -30,11 +30,11 @@ import {Content} from '../content/content'; * ``` * * ```ts - * @Page({...}) + * @Component({...}) * export class NewsFeedPage { + * items = []; * * constructor() { - * this.items = []; * for (var i = 0; i < 30; i++) { * this.items.push( this.items.length ); * } diff --git a/src/components/infinite-scroll/test/basic/index.ts b/src/components/infinite-scroll/test/basic/index.ts index 0fba97beee..14268d3fdd 100644 --- a/src/components/infinite-scroll/test/basic/index.ts +++ b/src/components/infinite-scroll/test/basic/index.ts @@ -1,8 +1,8 @@ -import {ViewChild} from '@angular/core'; -import {App, Page, InfiniteScroll, NavController} from '../../../../../src'; +import {Component, ViewChild} from '@angular/core'; +import {ionicBootstrap, InfiniteScroll, NavController} from '../../../../../src'; -@Page({ +@Component({ templateUrl: 'main.html' }) class E2EPage1 { @@ -45,26 +45,24 @@ class E2EPage1 { } -@Page({ +@Component({ template: '' }) class E2EPage2 { - constructor(private nav: NavController) {} - } -@App({ +@Component({ template: '' }) class E2EApp { - root; - constructor() { - this.root = E2EPage1; - } + root = E2EPage1; } +ionicBootstrap(E2EApp); + + function getAsyncData(): Promise { // async return mock data return new Promise(resolve => { diff --git a/src/components/infinite-scroll/test/short-list/index.ts b/src/components/infinite-scroll/test/short-list/index.ts index b58c55841e..ef0680eca2 100644 --- a/src/components/infinite-scroll/test/short-list/index.ts +++ b/src/components/infinite-scroll/test/short-list/index.ts @@ -1,10 +1,11 @@ -import {App, InfiniteScroll} from '../../../../../src'; +import {Component, ViewChild} from '@angular/core'; +import {ionicBootstrap, InfiniteScroll} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { +class E2EPage { items = []; constructor() { @@ -32,6 +33,8 @@ class E2EApp { } +ionicBootstrap(E2EPage); + function getAsyncData(): Promise { // async return mock data return new Promise(resolve => { diff --git a/src/components/input/test/clear-input/index.ts b/src/components/input/test/clear-input/index.ts index fb0b644bf0..f0dfc7ba73 100644 --- a/src/components/input/test/clear-input/index.ts +++ b/src/components/input/test/clear-input/index.ts @@ -1,11 +1,12 @@ -import {App} from 'ionic-angular'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ - templateUrl: 'main.html' +@Component({ + templateUrl: 'main.html' }) -class E2EApp { - constructor() { - this.myValue = 'value'; - } +class E2EPage { + myValue = 'value'; } + +ionicBootstrap(E2EPage); diff --git a/src/components/input/test/fixed-inline-labels/index.ts b/src/components/input/test/fixed-inline-labels/index.ts index 81265c0c52..bb33ae830b 100644 --- a/src/components/input/test/fixed-inline-labels/index.ts +++ b/src/components/input/test/fixed-inline-labels/index.ts @@ -1,7 +1,8 @@ -import {App, Page} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@Page({ +@Component({ templateUrl: 'main.html' }) class PageOne { @@ -13,9 +14,11 @@ class PageOne { } } -@App({ +@Component({ template: '' }) class E2EApp { root = PageOne; } + +ionicBootstrap(E2EApp); diff --git a/src/components/input/test/floating-labels/index.ts b/src/components/input/test/floating-labels/index.ts index dc4612318b..115efecc15 100644 --- a/src/components/input/test/floating-labels/index.ts +++ b/src/components/input/test/floating-labels/index.ts @@ -1,17 +1,17 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { - constructor() { - this.myParam = ''; - - this.myValues = { - value1: 'Dynamic Input', - value2: 'Dynamic Textarea' - }; - } +class E2EPage { + myParam = ''; + myValues = { + value1: 'Dynamic Input', + value2: 'Dynamic Textarea' + }; } + +ionicBootstrap(E2EPage); diff --git a/src/components/input/test/form-inputs/index.ts b/src/components/input/test/form-inputs/index.ts index 6e884ffd7f..d0711ced2d 100644 --- a/src/components/input/test/form-inputs/index.ts +++ b/src/components/input/test/form-inputs/index.ts @@ -1,8 +1,9 @@ -import {App, Page} from '../../../../../src'; -import {FormBuilder, Validators, Control} from '@angular/common'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; +import {FormBuilder, Validators} from '@angular/common'; -@Page({ +@Component({ templateUrl: 'main.html' }) class E2EPage { @@ -53,9 +54,11 @@ class E2EPage { } -@App({ - template: '' +@Component({ + template: '' }) class E2EApp { - rootPage = E2EPage; + root = E2EPage; } + +ionicBootstrap(E2EApp); diff --git a/src/components/input/test/inline-labels/index.ts b/src/components/input/test/inline-labels/index.ts index b06c84f21f..3d986f1c7b 100644 --- a/src/components/input/test/inline-labels/index.ts +++ b/src/components/input/test/inline-labels/index.ts @@ -1,12 +1,15 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { +class E2EPage { submit(ev) { + console.debug('submit', ev); } - } + +ionicBootstrap(E2EPage); diff --git a/src/components/input/test/input-focus/index.ts b/src/components/input/test/input-focus/index.ts index 1dce546cde..29915d7468 100644 --- a/src/components/input/test/input-focus/index.ts +++ b/src/components/input/test/input-focus/index.ts @@ -1,34 +1,36 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ - templateUrl: 'main.html', - config: { - //scrollAssist: true - } +@Component({ + templateUrl: 'main.html' }) -class E2EApp { +class E2EPage { reload() { window.location.reload(); } } -document.addEventListener('click', function(ev) { +document.addEventListener('click', (ev: any) => { console.log(`CLICK, ${ev.target.localName}.${ev.target.className}, time: ${Date.now()}`); }); -document.addEventListener('touchstart', function(ev) { +document.addEventListener('touchstart', (ev: any) => { console.log(`TOUCH START, ${ev.target.localName}.${ev.target.className}, time: ${Date.now()}`); }); -document.addEventListener('touchend', function(ev) { +document.addEventListener('touchend', (ev: any) => { console.log(`TOUCH END, ${ev.target.localName}.${ev.target.className}, time: ${Date.now()}`); }); -document.addEventListener('focusin', function(ev) {console.log(`CLICK, ${ev.target.localName}.${ev.target.className}, time: ${Date.now()}`); +document.addEventListener('focusin', (ev: any) => { + console.log(`CLICK, ${ev.target.localName}.${ev.target.className}, time: ${Date.now()}`); console.log(`FOCUS IN, ${ev.target.localName}.${ev.target.className}, time: ${Date.now()}`); }); -document.addEventListener('focusout', function(ev) {console.log(`CLICK, ${ev.target.localName}.${ev.target.className}, time: ${Date.now()}`); +document.addEventListener('focusout', (ev: any) => { + console.log(`CLICK, ${ev.target.localName}.${ev.target.className}, time: ${Date.now()}`); console.log(`FOCUS OUT, ${ev.target.localName}.${ev.target.className}, time: ${Date.now()}`); }); + +ionicBootstrap(E2EPage); diff --git a/src/components/input/test/inset-inputs/index.ts b/src/components/input/test/inset-inputs/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/input/test/inset-inputs/index.ts +++ b/src/components/input/test/inset-inputs/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/input/test/placeholder-labels/index.ts b/src/components/input/test/placeholder-labels/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/input/test/placeholder-labels/index.ts +++ b/src/components/input/test/placeholder-labels/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/input/test/stacked-labels/index.ts b/src/components/input/test/stacked-labels/index.ts index 9bbd356df0..6ead56a99e 100644 --- a/src/components/input/test/stacked-labels/index.ts +++ b/src/components/input/test/stacked-labels/index.ts @@ -1,14 +1,18 @@ -import {App, Page} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ - template: '' -}) -class E2EApp { - rootPage = PageOne; -} - -@Page({ +@Component({ templateUrl: 'main.html' }) class PageOne {} + + +@Component({ + template: '' +}) +class E2EApp { + root = PageOne; +} + +ionicBootstrap(E2EApp); diff --git a/src/components/item/test/buttons/index.ts b/src/components/item/test/buttons/index.ts index 8047e50e49..7473e617bd 100644 --- a/src/components/item/test/buttons/index.ts +++ b/src/components/item/test/buttons/index.ts @@ -1,13 +1,14 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { - +class E2EPage { testClick(ev) { console.log('CLICK!', ev.target.tagName, ev.target.textContent.trim()); } - } + +ionicBootstrap(E2EPage); diff --git a/src/components/item/test/dividers/index.ts b/src/components/item/test/dividers/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/item/test/dividers/index.ts +++ b/src/components/item/test/dividers/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/item/test/groups/index.ts b/src/components/item/test/groups/index.ts index dc9c7dbb43..8bdccb9a53 100644 --- a/src/components/item/test/groups/index.ts +++ b/src/components/item/test/groups/index.ts @@ -1,7 +1,8 @@ -import {App, Page, NavController, NavParams} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap, NavController, NavParams} from '../../../../../src'; -@Page({ +@Component({ template: ` {{session.name}} @@ -13,22 +14,21 @@ import {App, Page, NavController, NavParams} from '../../../../../src'; ` }) class SessionDetail { - constructor(params: NavParams, nav: NavController) { + session; + + constructor(params: NavParams, public nav: NavController) { this.session = params.data; - this.nav = nav; } } -@Page({ +@Component({ templateUrl: 'session-list.html' }) class SessionList { + data = data; - constructor(nav: NavController) { - this.nav = nav; - this.data = data; - } + constructor(public nav: NavController) {} addFavorite(timeSlot, session, slidingItem) { console.error("addFavorite", timeSlot, session, slidingItem); @@ -45,15 +45,15 @@ class SessionList { } -@App({ +@Component({ template: '' }) class E2EApp { - constructor() { - this.root = SessionList; - } + root = SessionList; } +ionicBootstrap(E2EApp); + let data = [ { diff --git a/src/components/item/test/icons/index.ts b/src/components/item/test/icons/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/item/test/icons/index.ts +++ b/src/components/item/test/icons/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/item/test/images/index.ts b/src/components/item/test/images/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/item/test/images/index.ts +++ b/src/components/item/test/images/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/item/test/media/index.ts b/src/components/item/test/media/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/item/test/media/index.ts +++ b/src/components/item/test/media/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/item/test/sliding/index.ts b/src/components/item/test/sliding/index.ts index 012db577ca..d9571ea7db 100644 --- a/src/components/item/test/sliding/index.ts +++ b/src/components/item/test/sliding/index.ts @@ -1,8 +1,8 @@ -import {ViewChild} from '@angular/core'; -import {App, Page, IonicApp, Alert, NavController, List, ItemSliding} from '../../../../../src'; +import {Component, ViewChild} from '@angular/core'; +import {ionicBootstrap, App, Alert, NavController, List, ItemSliding} from '../../../../../src'; -@Page({ +@Component({ templateUrl: 'main.html' }) class E2EPage { @@ -11,7 +11,7 @@ class E2EPage { items = []; shouldShow: boolean = true; - constructor(private app: IonicApp, private nav: NavController) { + constructor(private app: App, private nav: NavController) { for (let x = 0; x < 20; x++) { this.items.push(x); } @@ -67,13 +67,11 @@ class E2EPage { } -@App({ +@Component({ template: '' }) class E2EApp { root = E2EPage; - - constructor() { - - } } + +ionicBootstrap(E2EApp); diff --git a/src/components/item/test/text/index.ts b/src/components/item/test/text/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/item/test/text/index.ts +++ b/src/components/item/test/text/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/list/test/headers/index.ts b/src/components/list/test/headers/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/list/test/headers/index.ts +++ b/src/components/list/test/headers/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/list/test/inset/index.ts b/src/components/list/test/inset/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/list/test/inset/index.ts +++ b/src/components/list/test/inset/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/list/test/no-lines/index.ts b/src/components/list/test/no-lines/index.ts index 5fe8f60eaa..6fe29fcc36 100644 --- a/src/components/list/test/no-lines/index.ts +++ b/src/components/list/test/no-lines/index.ts @@ -1,7 +1,10 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp {} +class E2EPage {} + +ionicBootstrap(E2EPage); diff --git a/src/components/list/test/repeat-headers/index.ts b/src/components/list/test/repeat-headers/index.ts index ccaf372c87..5d9eabfb1d 100644 --- a/src/components/list/test/repeat-headers/index.ts +++ b/src/components/list/test/repeat-headers/index.ts @@ -1,15 +1,16 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { - constructor() { - this.people = [ - {"name": "Adam Bradley", "components": [ "all the things"]}, - {"name": "Max Lynch", "components": [ "checkbox", "content", "form"]}, - {"name": "Tim Lancina", "components": [ "tabs"]} - ]; - } +class E2EPage { + people = [ + {"name": "Burt", "components": [ "all the things"]}, + {"name": "Mary", "components": [ "checkbox", "content", "form"]}, + {"name": "Albert", "components": [ "tabs"]} + ]; } + +ionicBootstrap(E2EPage); diff --git a/src/components/list/test/sticky/index.ts b/src/components/list/test/sticky/index.ts index ebe33603d2..bd4f063da7 100644 --- a/src/components/list/test/sticky/index.ts +++ b/src/components/list/test/sticky/index.ts @@ -1,22 +1,25 @@ -import {App} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { - constructor() { - this.groups = []; +class E2EPage { + groups = []; + constructor() { var letters = "abcdefghijklmnopqrstuvwxyz".split(''); - for(let i = 0; i < letters.length; i++) { - let group = []; - for(let j = 0; j < 10; j++) { + for (var i = 0; i < letters.length; i++) { + var group = []; + + for (var j = 0; j < 10; j++) { group.push({ title: letters[i] + j }); } + this.groups.push({ title: letters[i].toUpperCase(), items: group @@ -24,3 +27,5 @@ class E2EApp { } } } + +ionicBootstrap(E2EPage); diff --git a/src/components/loading/test/basic/index.ts b/src/components/loading/test/basic/index.ts index 745ea23234..2ad116ca65 100644 --- a/src/components/loading/test/basic/index.ts +++ b/src/components/loading/test/basic/index.ts @@ -1,7 +1,8 @@ -import {App, Page, ActionSheet, Loading, NavController, ViewController, Platform} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap, ActionSheet, Loading, NavController, ViewController, Platform} from '../../../../../src'; -@Page({ +@Component({ templateUrl: 'main.html' }) class E2EPage { @@ -185,7 +186,7 @@ class E2EPage { } } -@Page({ +@Component({ template: ` Page 2 @@ -215,7 +216,7 @@ class Page2 { } } -@Page({ +@Component({ template: ` Page 3 @@ -227,11 +228,13 @@ class Page3 { constructor(private nav: NavController, private platform: Platform) {} } -@App({ +@Component({ template: '' }) class E2EApp { root = E2EPage; } +ionicBootstrap(E2EApp); + document.body.innerHTML += '' diff --git a/src/components/loading/test/tabs/index.ts b/src/components/loading/test/tabs/index.ts index 50701393dd..37fe6bf977 100644 --- a/src/components/loading/test/tabs/index.ts +++ b/src/components/loading/test/tabs/index.ts @@ -1,7 +1,8 @@ -import {App, Page, ActionSheet, Loading, NavController, ViewController, Platform} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap, ActionSheet, Loading, NavController, ViewController, Platform} from '../../../../../src'; -@Page({ +@Component({ templateUrl: 'main.html' }) class E2EPage { @@ -35,7 +36,7 @@ class E2EPage { } -@Page({ +@Component({ template: ` Page 2 @@ -47,7 +48,7 @@ class Page2 { constructor(private nav: NavController, private platform: Platform) {} } -@Page({ +@Component({ template: ` @@ -66,9 +67,11 @@ export class TabsPage { } } -@App({ +@Component({ template: '' }) class E2EApp { root = TabsPage; } + +ionicBootstrap(E2EApp); diff --git a/src/components/menu/test/basic/index.ts b/src/components/menu/test/basic/index.ts index 3e5830c310..337b553481 100644 --- a/src/components/menu/test/basic/index.ts +++ b/src/components/menu/test/basic/index.ts @@ -1,8 +1,8 @@ -import {ViewChild} from '@angular/core'; -import {App, IonicApp, MenuController, Page, NavController, Alert, Nav} from '../../../../../src'; +import {Component, ViewChild} from '@angular/core'; +import {ionicBootstrap, MenuController, NavController, Alert, Nav} from '../../../../../src'; -@Page({ +@Component({ templateUrl: 'page1.html' }) class Page1 { @@ -24,11 +24,11 @@ class Page1 { } -@Page({templateUrl: 'page3.html'}) +@Component({templateUrl: 'page3.html'}) class Page3 {} -@Page({templateUrl: 'page2.html'}) +@Component({templateUrl: 'page2.html'}) class Page2 { constructor(private nav: NavController) {} @@ -38,16 +38,16 @@ class Page2 { } -@App({ +@Component({ templateUrl: 'main.html' }) -class E2EApp { +class E2EPage { rootPage; changeDetectionCount: number = 0; pages: Array<{title: string, component: any}>; @ViewChild(Nav) nav: Nav; - constructor(private app: IonicApp, private menu: MenuController) { + constructor(private menu: MenuController) { this.rootPage = Page1; this.pages = [ @@ -76,3 +76,5 @@ class E2EApp { return true; } } + +ionicBootstrap(E2EPage); diff --git a/src/components/menu/test/basic/main.html b/src/components/menu/test/basic/main.html index d607c74b63..0124d60348 100644 --- a/src/components/menu/test/basic/main.html +++ b/src/components/menu/test/basic/main.html @@ -138,6 +138,6 @@ - +
\ No newline at end of file diff --git a/src/components/menu/test/disable-swipe/index.ts b/src/components/menu/test/disable-swipe/index.ts index ee4c560d8e..1133a7c203 100644 --- a/src/components/menu/test/disable-swipe/index.ts +++ b/src/components/menu/test/disable-swipe/index.ts @@ -1,15 +1,15 @@ -import {App, Page, NavController, MenuController} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap, NavController, MenuController} from '../../../../../src'; -@Page({ + +@Component({ templateUrl: 'page1.html' }) class Page1 { leftMenuSwipeEnabled: boolean = true; rightMenuSwipeEnabled: boolean = false; - constructor(menu: MenuController) { - this.menu = menu; - } + constructor(public menu: MenuController) {} toggleLeftMenuSwipeable() { this.leftMenuSwipeEnabled = !this.leftMenuSwipeEnabled; @@ -25,11 +25,9 @@ class Page1 { } -@App({ +@Component({ templateUrl: 'main.html' }) class E2EApp { - constructor() { - this.rootView = Page1; - } + root = Page1; } diff --git a/src/components/menu/test/disable-swipe/main.html b/src/components/menu/test/disable-swipe/main.html index 9f8a62db37..5d7a9d14d2 100644 --- a/src/components/menu/test/disable-swipe/main.html +++ b/src/components/menu/test/disable-swipe/main.html @@ -33,4 +33,4 @@ - + diff --git a/src/components/menu/test/enable-disable/index.ts b/src/components/menu/test/enable-disable/index.ts index 4b1b634a76..6d25c71f66 100644 --- a/src/components/menu/test/enable-disable/index.ts +++ b/src/components/menu/test/enable-disable/index.ts @@ -1,21 +1,21 @@ -import {ViewChild} from '@angular/core'; -import {App, Page, IonicApp, MenuController, Nav} from '../../../../../src'; +import {Component, ViewChild} from '@angular/core'; +import {ionicBootstrap, App, MenuController, Nav} from '../../../../../src'; -@Page({ +@Component({ templateUrl: 'page1.html' }) class Page1 { } -@Page({ +@Component({ templateUrl: 'page2.html' }) class Page2 { } -@App({ +@Component({ templateUrl: 'main.html' }) class E2EApp { @@ -26,7 +26,7 @@ class E2EApp { page2 = Page2; rootPage = Page1; - constructor(private app: IonicApp, private menu: MenuController) { + constructor(private app: App, private menu: MenuController) { this.menu1Active(); } @@ -51,3 +51,5 @@ class E2EApp { this.menu.enable(true, 'menu3'); } } + +ionicBootstrap(E2EApp); diff --git a/src/components/menu/test/multiple/index.ts b/src/components/menu/test/multiple/index.ts index 835faab615..669556fea5 100644 --- a/src/components/menu/test/multiple/index.ts +++ b/src/components/menu/test/multiple/index.ts @@ -1,7 +1,8 @@ -import {App, Page, MenuController} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap, MenuController} from '../../../../../src'; -@Page({ +@Component({ templateUrl: 'page1.html' }) class Page1 { @@ -23,13 +24,11 @@ class Page1 { } -@App({ +@Component({ templateUrl: 'main.html' }) class E2EApp { - rootPage; - - constructor() { - this.rootPage = Page1; - } + rootPage = Page1; } + +ionicBootstrap(E2EApp); diff --git a/src/components/menu/test/overlay/index.ts b/src/components/menu/test/overlay/index.ts index 8307bd598f..16c982aaf5 100644 --- a/src/components/menu/test/overlay/index.ts +++ b/src/components/menu/test/overlay/index.ts @@ -1,12 +1,12 @@ -import {ViewChild} from '@angular/core'; -import {App, Page, Nav} from '../../../../../src'; +import {Component, ViewChild} from '@angular/core'; +import {ionicBootstrap, Nav} from '../../../../../src'; -@Page({templateUrl: 'page1.html'}) +@Component({templateUrl: 'page1.html'}) class Page1 {} -@App({ +@Component({ templateUrl: 'main.html' }) class E2EApp { @@ -14,10 +14,6 @@ class E2EApp { rootView = Page1; - constructor() { - - } - openPage(menu, page) { // close the menu when clicking a link from the menu menu.close(); @@ -27,3 +23,5 @@ class E2EApp { this.nav.setRoot(page.component); } } + +ionicBootstrap(E2EApp); diff --git a/src/components/menu/test/push/index.ts b/src/components/menu/test/push/index.ts index 8307bd598f..16c982aaf5 100644 --- a/src/components/menu/test/push/index.ts +++ b/src/components/menu/test/push/index.ts @@ -1,12 +1,12 @@ -import {ViewChild} from '@angular/core'; -import {App, Page, Nav} from '../../../../../src'; +import {Component, ViewChild} from '@angular/core'; +import {ionicBootstrap, Nav} from '../../../../../src'; -@Page({templateUrl: 'page1.html'}) +@Component({templateUrl: 'page1.html'}) class Page1 {} -@App({ +@Component({ templateUrl: 'main.html' }) class E2EApp { @@ -14,10 +14,6 @@ class E2EApp { rootView = Page1; - constructor() { - - } - openPage(menu, page) { // close the menu when clicking a link from the menu menu.close(); @@ -27,3 +23,5 @@ class E2EApp { this.nav.setRoot(page.component); } } + +ionicBootstrap(E2EApp); diff --git a/src/components/menu/test/reveal/index.ts b/src/components/menu/test/reveal/index.ts index 8307bd598f..16c982aaf5 100644 --- a/src/components/menu/test/reveal/index.ts +++ b/src/components/menu/test/reveal/index.ts @@ -1,12 +1,12 @@ -import {ViewChild} from '@angular/core'; -import {App, Page, Nav} from '../../../../../src'; +import {Component, ViewChild} from '@angular/core'; +import {ionicBootstrap, Nav} from '../../../../../src'; -@Page({templateUrl: 'page1.html'}) +@Component({templateUrl: 'page1.html'}) class Page1 {} -@App({ +@Component({ templateUrl: 'main.html' }) class E2EApp { @@ -14,10 +14,6 @@ class E2EApp { rootView = Page1; - constructor() { - - } - openPage(menu, page) { // close the menu when clicking a link from the menu menu.close(); @@ -27,3 +23,5 @@ class E2EApp { this.nav.setRoot(page.component); } } + +ionicBootstrap(E2EApp); diff --git a/src/components/modal/test/basic/index.ts b/src/components/modal/test/basic/index.ts index 1c7ee9e2e8..ca339f5e3d 100644 --- a/src/components/modal/test/basic/index.ts +++ b/src/components/modal/test/basic/index.ts @@ -1,7 +1,8 @@ -import {App, Page, Config, Platform} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap, Config, Platform} from '../../../../../src'; import {Modal, ActionSheet, NavController, NavParams, Transition, TransitionOptions, ViewController} from '../../../../../src'; -@Page({ +@Component({ templateUrl: 'main.html' }) class E2EPage { @@ -76,7 +77,7 @@ class E2EPage { } } -@Page({ +@Component({ template: ` Page One @@ -95,7 +96,7 @@ class NavigableModal{ } } -@Page({ +@Component({ template: ` Page Two @@ -116,7 +117,7 @@ class NavigableModal2{ -@Page({ +@Component({ template: ` Data in/out @@ -172,7 +173,7 @@ class ModalPassData { } -@Page({ +@Component({ template: ` Toolbar 1 @@ -203,7 +204,7 @@ class ToolbarModal { } -@Page({ +@Component({ template: ` @@ -255,7 +256,7 @@ class ModalWithInputs { } -@Page({ +@Component({ template: '' }) class ContactUs { @@ -289,7 +290,7 @@ class ContactUs { } -@Page({ +@Component({ template: ` First Page Header @@ -397,7 +398,7 @@ class ModalFirstPage { } -@Page({ +@Component({ template: ` Second Page Header @@ -430,17 +431,15 @@ class ModalSecondPage { } -@App({ +@Component({ template: '' }) class E2EApp { - root; - - constructor() { - this.root = E2EPage; - } + root = E2EPage; } +ionicBootstrap(E2EApp); + class FadeIn extends Transition { constructor(enteringView: ViewController, leavingView: ViewController, opts: TransitionOptions) { diff --git a/src/components/nav/test/basic/index.ts b/src/components/nav/test/basic/index.ts index 41848ade35..478fbd9e78 100644 --- a/src/components/nav/test/basic/index.ts +++ b/src/components/nav/test/basic/index.ts @@ -1,6 +1,6 @@ import {Component, Type, ViewChild} from '@angular/core'; import {App, NavController, Alert, Content} from '../../../../../src'; -import {Page, Config, IonicApp} from '../../../../../src'; +import {ionicBootstrap, Config} from '../../../../../src'; import {NavParams, ViewController} from '../../../../../src';; @@ -11,7 +11,7 @@ import {NavParams, ViewController} from '../../../../../src';; class MyCmpTest{} -@Page({ +@Component({ template: ` {{title}} @@ -129,7 +129,7 @@ class FirstPage { } -@Page({ +@Component({ template: `

Full page

@@ -199,7 +199,7 @@ class FullPage { } -@Page({ +@Component({ template: ` Primary Color Page Header @@ -265,7 +265,7 @@ class PrimaryHeaderPage { } -@Page({ +@Component({ template: ` Another Page Header @@ -367,22 +367,19 @@ class AnotherPage { } -@App({ - pages: [FirstPage, FullPage, PrimaryHeaderPage, AnotherPage], +@Component({ template: ``, host: { '[class.is-change-detecting]': 'isChangeDetecting' } }) class E2EApp { - root; - - constructor() { - this.root = FirstPage; - } + root = FirstPage; get isChangeDetecting() { console.log('isChangeDetecting'); return true; } } + +ionicBootstrap(E2EApp); diff --git a/src/components/nav/test/init-async/index.ts b/src/components/nav/test/init-async/index.ts index 7880e493cb..f9d6d5beb9 100644 --- a/src/components/nav/test/init-async/index.ts +++ b/src/components/nav/test/init-async/index.ts @@ -1,7 +1,8 @@ -import {App, Page} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap} from '../../../../../src'; -@Page({ +@Component({ template: ` Page be loaded! @@ -11,7 +12,7 @@ import {App, Page} from '../../../../../src'; class AsyncPage {} -@App({ +@Component({ template: `` }) class E2EApp { @@ -24,3 +25,5 @@ class E2EApp { } } + +ionicBootstrap(E2EApp); diff --git a/src/components/nav/test/insert-views/index.ts b/src/components/nav/test/insert-views/index.ts index 0205fc08a9..17c80cce7b 100644 --- a/src/components/nav/test/insert-views/index.ts +++ b/src/components/nav/test/insert-views/index.ts @@ -1,8 +1,8 @@ -import {App, Page, NavController} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap, NavController} from '../../../../../src'; - -@Page({ +@Component({ template: ` Root @@ -13,16 +13,15 @@ import {App, Page, NavController} from '../../../../../src'; `, }) class FirstPage { - constructor(nav: NavController) { - this.nav = nav; - } + constructor(public nav: NavController) {} + pushPage() { this.nav.push(SecondPage) } } -@Page({ +@Component({ template: ` Root @@ -35,16 +34,15 @@ class FirstPage { ` }) class SecondPage { - constructor(nav: NavController) { - this.nav = nav; - } + constructor(public nav: NavController) {} + insertPage() { this.nav.insert(1, InsertPage) } } -@Page({ +@Component({ template: ` Inserted Paged @@ -54,17 +52,14 @@ class SecondPage { ` }) -class InsertPage { - constructor() { } -} +class InsertPage {} - -@App({ +@Component({ template: `` }) class E2EApp { - constructor() { - this.root = FirstPage; - } + root = FirstPage; } + +ionicBootstrap(E2EApp); diff --git a/src/components/nav/test/memory/index.ts b/src/components/nav/test/memory/index.ts index e33fe473c1..4422d98392 100644 --- a/src/components/nav/test/memory/index.ts +++ b/src/components/nav/test/memory/index.ts @@ -1,11 +1,12 @@ -import {App, Page, NavController} from '../../../../../src'; +import {Component} from '@angular/core'; +import {ionicBootstrap, NavController} from '../../../../../src'; let delay = 100; let animate = false; let count = 0; -@Page({ +@Component({ template: `

Page 1

@@ -39,7 +40,7 @@ class Page1 { } } -@Page({ +@Component({ template: `

Page 2

@@ -74,13 +75,11 @@ class Page2 { } -@App({ +@Component({ template: `` }) class E2EApp { - root; - - constructor() { - this.root = Page1; - } + root = Page1; } + +ionicBootstrap(E2EApp); diff --git a/src/components/nav/test/nested/index.ts b/src/components/nav/test/nested/index.ts index 57d229b3ed..3186836953 100644 --- a/src/components/nav/test/nested/index.ts +++ b/src/components/nav/test/nested/index.ts @@ -1,9 +1,9 @@ -import {ViewChild} from '@angular/core'; -import {App, NavParams, NavController, ViewController, MenuController} from '../../../../../src'; -import {Page, Config, Nav} from '../../../../../src'; +import {Component, ViewChild} from '@angular/core'; +import {ionicBootstrap, NavParams, NavController, ViewController, MenuController} from '../../../../../src'; +import {Config, Nav} from '../../../../../src'; -@Page({ +@Component({ template: ` Login @@ -22,7 +22,7 @@ export class Login { } -@Page({ +@Component({ template: ` @@ -73,7 +73,7 @@ export class Account { } -@Page({ +@Component({ template: `