diff --git a/demos/button/AppModule.ts b/demos/button/AppModule.ts deleted file mode 100644 index 2b671f155e..0000000000 --- a/demos/button/AppModule.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -export class ApiDemoPage {} - - -@Component({ - template: '' -}) -export class ApiDemoApp { - root = ApiDemoPage; -} - -@NgModule({ - declarations: [ - ApiDemoApp, - ApiDemoPage - ], - imports: [ - IonicModule.forRoot(ApiDemoApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - ApiDemoPage - ] -}) -export class AppModule {} \ No newline at end of file diff --git a/demos/chip/index.ts b/demos/chip/index.ts deleted file mode 100644 index 63773d3346..0000000000 --- a/demos/chip/index.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { Component } from '@angular/core'; - -import { ionicBootstrap } from 'ionic-angular'; - - -@Component({ - templateUrl: 'main.html' -}) -class ApiDemoPage { - delete(chip: Element) { - chip.remove(); - } -} - - -@Component({ - template: '' -}) -class ApiDemoApp { - root = ApiDemoPage; -} - -ionicBootstrap(ApiDemoApp); - diff --git a/demos/list/AppModule.ts b/demos/list/AppModule.ts deleted file mode 100644 index 85adcb45d4..0000000000 --- a/demos/list/AppModule.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Component, NgModule } from '@angular/core'; - -import { IonicModule } from 'ionic-angular'; - -@Component({ - templateUrl: 'main.html' -}) -export class ApiDemoPage {} - - -@Component({ - template: '' -}) -export class ApiDemoApp { - root = ApiDemoPage; -} - -@NgModule({ - declarations: [ - ApiDemoApp, - ApiDemoPage - ], - imports: [ - IonicModule.forRoot(ApiDemoApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - ApiDemoPage - ] -}) -export class AppModule {} diff --git a/demos/show-when/AppModule.ts b/demos/show-when/AppModule.ts deleted file mode 100644 index e1d485cf11..0000000000 --- a/demos/show-when/AppModule.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; - -@Component({ - templateUrl: 'main.html' -}) -export class ApiDemoPage {} - - -@Component({ - template: '' -}) -export class ApiDemoApp { - root = ApiDemoPage; -} - -@NgModule({ - declarations: [ - ApiDemoApp, - ApiDemoPage - ], - imports: [ - IonicModule.forRoot(ApiDemoApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - ApiDemoPage - ] -}) -export class AppModule {} diff --git a/demos/slides/AppModule.ts b/demos/slides/AppModule.ts deleted file mode 100644 index e1d485cf11..0000000000 --- a/demos/slides/AppModule.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; - -@Component({ - templateUrl: 'main.html' -}) -export class ApiDemoPage {} - - -@Component({ - template: '' -}) -export class ApiDemoApp { - root = ApiDemoPage; -} - -@NgModule({ - declarations: [ - ApiDemoApp, - ApiDemoPage - ], - imports: [ - IonicModule.forRoot(ApiDemoApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - ApiDemoPage - ] -}) -export class AppModule {} diff --git a/demos/action-sheet/AppModule.ts b/demos/src/action-sheet/AppModule.ts similarity index 93% rename from demos/action-sheet/AppModule.ts rename to demos/src/action-sheet/AppModule.ts index 4448135041..600e71bca6 100644 --- a/demos/action-sheet/AppModule.ts +++ b/demos/src/action-sheet/AppModule.ts @@ -1,6 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { ActionSheetController, IonicModule, Platform } from 'ionic-angular'; - +import { ActionSheetController, IonicApp, IonicModule, Platform } from 'ionic-angular'; @Component({ templateUrl: 'main.html' diff --git a/demos/action-sheet/main.html b/demos/src/action-sheet/main.html similarity index 100% rename from demos/action-sheet/main.html rename to demos/src/action-sheet/main.html diff --git a/demos/alert/AppModule.ts b/demos/src/alert/AppModule.ts similarity index 92% rename from demos/alert/AppModule.ts rename to demos/src/alert/AppModule.ts index 56e3cd4e6a..ae93590823 100644 --- a/demos/alert/AppModule.ts +++ b/demos/src/alert/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { AlertController, IonicApp, IonicModule } from 'ionic-angular'; @Component({ @@ -26,7 +26,7 @@ export class ApiDemoPage { doConfirm() { let alert = this.alertCtrl.create({ title: 'Use this lightsaber?', - body: 'Do you agree to use this lightsaber to do good across the intergalactic galaxy?', + message: 'Do you agree to use this lightsaber to do good across the intergalactic galaxy?', buttons: [ { text: 'Disagree', @@ -49,7 +49,7 @@ export class ApiDemoPage { doPrompt() { let alert = this.alertCtrl.create({ title: 'Login', - body: "Enter a name for this new album you're so keen on adding", + message: 'Enter a name for this new album you\'re so keen on adding', inputs: [ { name: 'title', @@ -211,7 +211,7 @@ export class ApiDemoPage { @Component({ - template: '' + template: `` }) export class ApiDemoApp { root = ApiDemoPage; @@ -231,4 +231,4 @@ export class ApiDemoApp { ApiDemoPage ] }) -export class AppModule {} \ No newline at end of file +export class AppModule {} diff --git a/demos/alert/main.html b/demos/src/alert/main.html similarity index 100% rename from demos/alert/main.html rename to demos/src/alert/main.html diff --git a/demos/app.core.scss b/demos/src/app.core.scss similarity index 100% rename from demos/app.core.scss rename to demos/src/app.core.scss diff --git a/demos/app.ios.scss b/demos/src/app.ios.scss similarity index 100% rename from demos/app.ios.scss rename to demos/src/app.ios.scss diff --git a/demos/app.md.scss b/demos/src/app.md.scss similarity index 100% rename from demos/app.md.scss rename to demos/src/app.md.scss diff --git a/demos/app.variables.local.scss b/demos/src/app.variables.local.scss similarity index 100% rename from demos/app.variables.local.scss rename to demos/src/app.variables.local.scss diff --git a/demos/app.variables.production.scss b/demos/src/app.variables.production.scss similarity index 100% rename from demos/app.variables.production.scss rename to demos/src/app.variables.production.scss diff --git a/demos/app.variables.scss b/demos/src/app.variables.scss similarity index 100% rename from demos/app.variables.scss rename to demos/src/app.variables.scss diff --git a/demos/app.wp.scss b/demos/src/app.wp.scss similarity index 100% rename from demos/app.wp.scss rename to demos/src/app.wp.scss diff --git a/demos/icon/AppModule.ts b/demos/src/button/AppModule.ts similarity index 89% rename from demos/icon/AppModule.ts rename to demos/src/button/AppModule.ts index fb8b9538bc..b171cbda72 100644 --- a/demos/icon/AppModule.ts +++ b/demos/src/button/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ diff --git a/demos/button/main.html b/demos/src/button/main.html similarity index 100% rename from demos/button/main.html rename to demos/src/button/main.html diff --git a/demos/checkbox/AppModule.ts b/demos/src/checkbox/AppModule.ts similarity index 88% rename from demos/checkbox/AppModule.ts rename to demos/src/checkbox/AppModule.ts index 0075d9ed01..2dd9cd4855 100644 --- a/demos/checkbox/AppModule.ts +++ b/demos/src/checkbox/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ @@ -44,4 +44,4 @@ export class ApiDemoApp { ApiDemoPage ] }) -export class AppModule {} \ No newline at end of file +export class AppModule {} diff --git a/demos/checkbox/main.html b/demos/src/checkbox/main.html similarity index 100% rename from demos/checkbox/main.html rename to demos/src/checkbox/main.html diff --git a/demos/toolbar/AppModule.ts b/demos/src/chip/AppModule.ts similarity index 81% rename from demos/toolbar/AppModule.ts rename to demos/src/chip/AppModule.ts index 2bc40db1f9..e4eb04ca2a 100644 --- a/demos/toolbar/AppModule.ts +++ b/demos/src/chip/AppModule.ts @@ -1,16 +1,15 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ templateUrl: 'main.html' }) export class ApiDemoPage { - demo = "Toolbar"; - favorites = "recent"; - apps = "free"; + delete(chip: Element) { + chip.remove(); + } } - @Component({ template: '' }) diff --git a/demos/chip/main.html b/demos/src/chip/main.html similarity index 100% rename from demos/chip/main.html rename to demos/src/chip/main.html diff --git a/demos/config/AppModule.ts b/demos/src/config/AppModule.ts similarity index 77% rename from demos/config/AppModule.ts rename to demos/src/config/AppModule.ts index 1a00d31df6..dbebb4002f 100644 --- a/demos/config/AppModule.ts +++ b/demos/src/config/AppModule.ts @@ -4,38 +4,38 @@ import { IonicModule, IonicApp, Platform, NavController } from 'ionic-angular'; if (!window.localStorage) { - Object.defineProperty(window, "localStorage", new (function () { + Object.defineProperty(window, 'localStorage', new (function () { var aKeys = [], oStorage = {}; - Object.defineProperty(oStorage, "getItem", { + Object.defineProperty(oStorage, 'getItem', { value: function (sKey) { return sKey ? this[sKey] : null; }, writable: false, configurable: false, enumerable: false }); - Object.defineProperty(oStorage, "key", { + Object.defineProperty(oStorage, 'key', { value: function (nKeyId) { return aKeys[nKeyId]; }, writable: false, configurable: false, enumerable: false }); - Object.defineProperty(oStorage, "setItem", { + Object.defineProperty(oStorage, 'setItem', { value: function (sKey, sValue) { - if(!sKey) { return; } - document.cookie = escape(sKey) + "=" + escape(sValue) + "; expires=Tue, 19 Jan 2038 03:14:07 GMT; path=/"; + if (!sKey) { return; } + document.cookie = encodeURI(sKey) + '=' + encodeURI(sValue) + '; expires=Tue, 19 Jan 2038 03:14:07 GMT; path=/'; }, writable: false, configurable: false, enumerable: false }); - Object.defineProperty(oStorage, "length", { + Object.defineProperty(oStorage, 'length', { get: function () { return aKeys.length; }, configurable: false, enumerable: false }); - Object.defineProperty(oStorage, "removeItem", { + Object.defineProperty(oStorage, 'removeItem', { value: function (sKey) { - if(!sKey) { return; } - document.cookie = escape(sKey) + "=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/"; + if (!sKey) { return; } + document.cookie = encodeURI(sKey) + '=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/'; }, writable: false, configurable: false, @@ -45,15 +45,18 @@ if (!window.localStorage) { var iThisIndx; for (var sKey in oStorage) { iThisIndx = aKeys.indexOf(sKey); - if (iThisIndx === -1) { oStorage.setItem(sKey, oStorage[sKey]); } - else { aKeys.splice(iThisIndx, 1); } + if (iThisIndx === -1) { + (oStorage as any).setItem(sKey, oStorage[sKey]); + } else { + aKeys.splice(iThisIndx, 1); + } delete oStorage[sKey]; } - for (aKeys; aKeys.length > 0; aKeys.splice(0, 1)) { oStorage.removeItem(aKeys[0]); } + for (aKeys; aKeys.length > 0; aKeys.splice(0, 1)) { (oStorage as any).removeItem(aKeys[0]); } for (var aCouple, iKey, nIdx = 0, aCouples = document.cookie.split(/\s*;\s*/); nIdx < aCouples.length; nIdx++) { aCouple = aCouples[nIdx].split(/\s*=\s*/); if (aCouple.length > 1) { - oStorage[iKey = unescape(aCouple[0])] = unescape(aCouple[1]); + oStorage[iKey = decodeURI(aCouple[0])] = decodeURI(aCouple[1]); aKeys.push(iKey); } } @@ -95,7 +98,7 @@ export class ApiDemoPage { 'iconMode': 'ios', 'tabsPlacement': 'bottom' }; - } else if(platform.is('windows')) { + } else if (platform.is('windows')) { this.config = { 'backButtonIcon': 'ios-arrow-back', 'iconMode': 'ios', @@ -157,4 +160,4 @@ export class ApiDemoApp { ApiDemoPage ] }) -export class AppModule {} \ No newline at end of file +export class AppModule {} diff --git a/demos/config/main.html b/demos/src/config/main.html similarity index 100% rename from demos/config/main.html rename to demos/src/config/main.html diff --git a/demos/config/page.html b/demos/src/config/page.html similarity index 100% rename from demos/config/page.html rename to demos/src/config/page.html diff --git a/demos/config/tabs.html b/demos/src/config/tabs.html similarity index 100% rename from demos/config/tabs.html rename to demos/src/config/tabs.html diff --git a/demos/datetime/AppModule.ts b/demos/src/datetime/AppModule.ts similarity index 95% rename from demos/datetime/AppModule.ts rename to demos/src/datetime/AppModule.ts index 10913f1755..56b8db9cd0 100644 --- a/demos/datetime/AppModule.ts +++ b/demos/src/datetime/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ templateUrl: 'main.html' @@ -83,4 +83,4 @@ export class ApiDemoApp { ApiDemoPage ] }) -export class AppModule {} \ No newline at end of file +export class AppModule {} diff --git a/demos/datetime/main.html b/demos/src/datetime/main.html similarity index 100% rename from demos/datetime/main.html rename to demos/src/datetime/main.html diff --git a/demos/events/AppModule.ts b/demos/src/events/AppModule.ts similarity index 92% rename from demos/events/AppModule.ts rename to demos/src/events/AppModule.ts index 3829fba951..6da4d4f1da 100644 --- a/demos/events/AppModule.ts +++ b/demos/src/events/AppModule.ts @@ -1,13 +1,13 @@ import { Component, ViewChild, NgModule } from '@angular/core'; -import { Events, IonicModule, Nav } from 'ionic-angular'; +import { Events, IonicApp, IonicModule, Nav } from 'ionic-angular'; @Component({ templateUrl: 'login.html' }) export class Login { user = { - name: "Administrator", - username: "admin" + name: 'Administrator', + username: 'admin' }; constructor(private events: Events) {} diff --git a/demos/events/app.html b/demos/src/events/app.html similarity index 100% rename from demos/events/app.html rename to demos/src/events/app.html diff --git a/demos/events/login.html b/demos/src/events/login.html similarity index 100% rename from demos/events/login.html rename to demos/src/events/login.html diff --git a/demos/events/logout.html b/demos/src/events/logout.html similarity index 100% rename from demos/events/logout.html rename to demos/src/events/logout.html diff --git a/demos/hide-when/AppModule.ts b/demos/src/hide-when/AppModule.ts similarity index 89% rename from demos/hide-when/AppModule.ts rename to demos/src/hide-when/AppModule.ts index fb8b9538bc..b171cbda72 100644 --- a/demos/hide-when/AppModule.ts +++ b/demos/src/hide-when/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ diff --git a/demos/hide-when/main.html b/demos/src/hide-when/main.html similarity index 100% rename from demos/hide-when/main.html rename to demos/src/hide-when/main.html diff --git a/demos/item/AppModule.ts b/demos/src/icon/AppModule.ts similarity index 89% rename from demos/item/AppModule.ts rename to demos/src/icon/AppModule.ts index fb8b9538bc..b171cbda72 100644 --- a/demos/item/AppModule.ts +++ b/demos/src/icon/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ diff --git a/demos/icon/main.html b/demos/src/icon/main.html similarity index 100% rename from demos/icon/main.html rename to demos/src/icon/main.html diff --git a/demos/infinite-scroll/AppModule.ts b/demos/src/infinite-scroll/AppModule.ts similarity index 93% rename from demos/infinite-scroll/AppModule.ts rename to demos/src/infinite-scroll/AppModule.ts index 11c88de5d1..b23be77de4 100644 --- a/demos/infinite-scroll/AppModule.ts +++ b/demos/src/infinite-scroll/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule, Injectable } from '@angular/core'; -import { IonicModule, InfiniteScroll } from 'ionic-angular'; +import { IonicApp, IonicModule, InfiniteScroll } from 'ionic-angular'; /** * Mock Data Access Object @@ -7,7 +7,7 @@ import { IonicModule, InfiniteScroll } from 'ionic-angular'; @Injectable() export class MockProvider { - getData() { + getData(): any[] { // return mock data synchronously let data = []; for (var i = 0; i < 20; i++) { @@ -16,7 +16,7 @@ export class MockProvider { return data; } - getAsyncData() { + getAsyncData(): Promise { // async receive mock data return new Promise(resolve => { diff --git a/demos/infinite-scroll/main.html b/demos/src/infinite-scroll/main.html similarity index 100% rename from demos/infinite-scroll/main.html rename to demos/src/infinite-scroll/main.html diff --git a/demos/input/AppModule.ts b/demos/src/input/AppModule.ts similarity index 89% rename from demos/input/AppModule.ts rename to demos/src/input/AppModule.ts index fb8b9538bc..b171cbda72 100644 --- a/demos/input/AppModule.ts +++ b/demos/src/input/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ diff --git a/demos/input/main.html b/demos/src/input/main.html similarity index 100% rename from demos/input/main.html rename to demos/src/input/main.html diff --git a/demos/item-reorder/AppModule.ts b/demos/src/item-reorder/AppModule.ts similarity index 93% rename from demos/item-reorder/AppModule.ts rename to demos/src/item-reorder/AppModule.ts index 5d24c4219c..b62a969109 100644 --- a/demos/item-reorder/AppModule.ts +++ b/demos/src/item-reorder/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule, ViewEncapsulation } from '@angular/core'; -import { IonicModule, ItemSliding, NavController, Toast, reorderArray } from 'ionic-angular'; +import { IonicApp, IonicModule, NavController, reorderArray } from 'ionic-angular'; @Component({ templateUrl: 'main.html', @@ -94,4 +94,4 @@ export class ApiDemoApp { ApiDemoPage ] }) -export class AppModule {} \ No newline at end of file +export class AppModule {} diff --git a/demos/item-reorder/main.html b/demos/src/item-reorder/main.html similarity index 100% rename from demos/item-reorder/main.html rename to demos/src/item-reorder/main.html diff --git a/demos/item-sliding/AppModule.ts b/demos/src/item-sliding/AppModule.ts similarity index 92% rename from demos/item-sliding/AppModule.ts rename to demos/src/item-sliding/AppModule.ts index fdf8eebe6f..bf424199cb 100644 --- a/demos/item-sliding/AppModule.ts +++ b/demos/src/item-sliding/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule, ViewEncapsulation } from '@angular/core'; -import { IonicModule, ItemSliding, ToastController } from 'ionic-angular'; +import { IonicApp, IonicModule, ItemSliding, ToastController } from 'ionic-angular'; @Component({ @@ -73,14 +73,14 @@ export class ApiDemoPage { } expandAction(item: ItemSliding, action: string, text: string) { - item.setCssClass(action, true); + // TODO item.setCssClass(action, true); setTimeout(() => { const toast = this.toastCtrl.create({ message: text }); toast.present(); - item.setCssClass(action, false); + // TODO item.setCssClass(action, false); item.close(); setTimeout(() => toast.dismiss(), 2000); diff --git a/demos/item-sliding/avatar-cher.png b/demos/src/item-sliding/avatar-cher.png similarity index 100% rename from demos/item-sliding/avatar-cher.png rename to demos/src/item-sliding/avatar-cher.png diff --git a/demos/item-sliding/avatar-dionne.png b/demos/src/item-sliding/avatar-dionne.png similarity index 100% rename from demos/item-sliding/avatar-dionne.png rename to demos/src/item-sliding/avatar-dionne.png diff --git a/demos/item-sliding/avatar-murray.png b/demos/src/item-sliding/avatar-murray.png similarity index 100% rename from demos/item-sliding/avatar-murray.png rename to demos/src/item-sliding/avatar-murray.png diff --git a/demos/item-sliding/main.html b/demos/src/item-sliding/main.html similarity index 100% rename from demos/item-sliding/main.html rename to demos/src/item-sliding/main.html diff --git a/demos/src/item/AppModule.ts b/demos/src/item/AppModule.ts new file mode 100644 index 0000000000..b171cbda72 --- /dev/null +++ b/demos/src/item/AppModule.ts @@ -0,0 +1,31 @@ +import { Component, NgModule } from '@angular/core'; +import { IonicApp, IonicModule } from 'ionic-angular'; + + +@Component({ + templateUrl: 'main.html' +}) +export class ApiDemoPage {} + + +@Component({ + template: '' +}) +export class ApiDemoApp { + root = ApiDemoPage; +} + +@NgModule({ + declarations: [ + ApiDemoApp, + ApiDemoPage + ], + imports: [ + IonicModule.forRoot(ApiDemoApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + ApiDemoPage + ] +}) +export class AppModule {} diff --git a/demos/item/main.html b/demos/src/item/main.html similarity index 100% rename from demos/item/main.html rename to demos/src/item/main.html diff --git a/demos/label/AppModule.ts b/demos/src/label/AppModule.ts similarity index 89% rename from demos/label/AppModule.ts rename to demos/src/label/AppModule.ts index c86fdfc598..739a83c887 100644 --- a/demos/label/AppModule.ts +++ b/demos/src/label/AppModule.ts @@ -1,6 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ diff --git a/demos/label/ionic.svg b/demos/src/label/ionic.svg similarity index 100% rename from demos/label/ionic.svg rename to demos/src/label/ionic.svg diff --git a/demos/label/main.html b/demos/src/label/main.html similarity index 100% rename from demos/label/main.html rename to demos/src/label/main.html diff --git a/demos/src/list/AppModule.ts b/demos/src/list/AppModule.ts new file mode 100644 index 0000000000..919511ce26 --- /dev/null +++ b/demos/src/list/AppModule.ts @@ -0,0 +1,31 @@ +import { Component, NgModule } from '@angular/core'; + +import { IonicApp, IonicModule } from 'ionic-angular'; + +@Component({ + templateUrl: 'main.html' +}) +export class ApiDemoPage {} + + +@Component({ + template: '' +}) +export class ApiDemoApp { + root = ApiDemoPage; +} + +@NgModule({ + declarations: [ + ApiDemoApp, + ApiDemoPage + ], + imports: [ + IonicModule.forRoot(ApiDemoApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + ApiDemoPage + ] +}) +export class AppModule {} diff --git a/demos/list/main.html b/demos/src/list/main.html similarity index 100% rename from demos/list/main.html rename to demos/src/list/main.html diff --git a/demos/loading/AppModule.ts b/demos/src/loading/AppModule.ts similarity index 97% rename from demos/loading/AppModule.ts rename to demos/src/loading/AppModule.ts index a18d3422ef..7d6b1d5a29 100644 --- a/demos/loading/AppModule.ts +++ b/demos/src/loading/AppModule.ts @@ -1,6 +1,6 @@ import { Component, NgModule, ViewEncapsulation } from '@angular/core'; -import { IonicModule, LoadingController, NavController } from 'ionic-angular'; +import { IonicApp, IonicModule, LoadingController, NavController } from 'ionic-angular'; @Component({ diff --git a/demos/loading/main.html b/demos/src/loading/main.html similarity index 100% rename from demos/loading/main.html rename to demos/src/loading/main.html diff --git a/demos/loading/styles.css b/demos/src/loading/styles.css similarity index 100% rename from demos/loading/styles.css rename to demos/src/loading/styles.css diff --git a/demos/local-storage/AppModule.ts b/demos/src/local-storage/AppModule.ts similarity index 83% rename from demos/local-storage/AppModule.ts rename to demos/src/local-storage/AppModule.ts index df93e0d6fb..4ad12b1964 100644 --- a/demos/local-storage/AppModule.ts +++ b/demos/src/local-storage/AppModule.ts @@ -1,7 +1,5 @@ import { Component, NgModule, Injectable, Pipe, PipeTransform } from '@angular/core'; - -import { Config, IonicModule, LocalStorage, Platform, Storage } from 'ionic-angular'; - +import { IonicApp, IonicModule, LocalStorage, Storage } from 'ionic-angular'; @Pipe({ name: 'cleanLocalData' @@ -12,7 +10,7 @@ export class CleanLocalDataPipe implements PipeTransform { output: any; data: any; - transform(obj:any) : any { + transform(obj: any): any { this.validKeys = ['username', 'name', 'email', 'address']; this.output = {}; this.data = JSON.parse(obj); @@ -27,8 +25,7 @@ export class CleanLocalDataPipe implements PipeTransform { @Component({ - templateUrl: 'main.html', - pipes: [CleanLocalDataPipe] + templateUrl: 'main.html' }) export class ApiDemoPage { local: Storage; @@ -55,11 +52,12 @@ export class ApiDemoPage { let added = false; for (let i = 0; i < this.addedKeys.length; i++) { - if (this.addedKeys[i] == this.myItem.key) added = true; + if (this.addedKeys[i] === this.myItem.key) { + added = true; + } } - if (added == false) { - console.log("Adding key", this.myItem.key); + if (added === false) { this.addedKeys.push(this.myItem.key); this.delKey = this.myItem.key; this.local.set(this.myItem.key, this.myItem.value ); @@ -81,8 +79,7 @@ export class ApiDemoPage { @Component({ - template: '', - pipes: [CleanLocalDataPipe] + template: '' }) export class ApiDemoApp { root = ApiDemoPage; diff --git a/demos/local-storage/main.html b/demos/src/local-storage/main.html similarity index 100% rename from demos/local-storage/main.html rename to demos/src/local-storage/main.html diff --git a/demos/menu/AppModule.ts b/demos/src/menu/AppModule.ts similarity index 91% rename from demos/menu/AppModule.ts rename to demos/src/menu/AppModule.ts index 00c194426a..c265509efa 100644 --- a/demos/menu/AppModule.ts +++ b/demos/src/menu/AppModule.ts @@ -1,6 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule, MenuController } from 'ionic-angular'; +import { IonicApp, IonicModule, MenuController } from 'ionic-angular'; @Component({ diff --git a/demos/menu/app.html b/demos/src/menu/app.html similarity index 100% rename from demos/menu/app.html rename to demos/src/menu/app.html diff --git a/demos/menu/main.html b/demos/src/menu/main.html similarity index 100% rename from demos/menu/main.html rename to demos/src/menu/main.html diff --git a/demos/modal/AppModule.ts b/demos/src/modal/AppModule.ts similarity index 90% rename from demos/modal/AppModule.ts rename to demos/src/modal/AppModule.ts index e3a803cdd7..cf33342a62 100644 --- a/demos/modal/AppModule.ts +++ b/demos/src/modal/AppModule.ts @@ -1,6 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { Animation, IonicModule, ModalController, NavController, NavParams, ViewController } from 'ionic-angular'; +import { Animation, IonicApp, IonicModule, ModalController, NavParams, ViewController } from 'ionic-angular'; @Component({ @@ -29,7 +29,7 @@ export class ModalFirstPage { @Component({ - templateUrl: "modal-content.html" + templateUrl: 'modal-content.html' }) export class ModalContentPage { myParam: string; @@ -58,15 +58,14 @@ export class ApiDemoApp { declarations: [ ApiDemoApp, ModalFirstPage, - ModalContentPage, - ApiDemoPage + ModalContentPage ], imports: [ IonicModule.forRoot(ApiDemoApp) ], bootstrap: [IonicApp], entryComponents: [ - ApiDemoPage + ModalFirstPage ] }) export class AppModule {} diff --git a/demos/modal/main.html b/demos/src/modal/main.html similarity index 100% rename from demos/modal/main.html rename to demos/src/modal/main.html diff --git a/demos/modal/modal-content.html b/demos/src/modal/modal-content.html similarity index 100% rename from demos/modal/modal-content.html rename to demos/src/modal/modal-content.html diff --git a/demos/nav-params/AppModule.ts b/demos/src/nav-params/AppModule.ts similarity index 85% rename from demos/nav-params/AppModule.ts rename to demos/src/nav-params/AppModule.ts index 9456025f3e..6b6041eed4 100644 --- a/demos/nav-params/AppModule.ts +++ b/demos/src/nav-params/AppModule.ts @@ -1,6 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule, NavController, NavParams } from 'ionic-angular'; +import { IonicApp, IonicModule, NavController, NavParams } from 'ionic-angular'; @Component({ @@ -18,7 +18,7 @@ export class ApiDemoPage { @Component({ - templateUrl: "page.html" + templateUrl: 'page.html' }) export class PushPage { myParam: string; @@ -39,7 +39,7 @@ export class ApiDemoApp { @NgModule({ declarations: [ ApiDemoApp, - ApiDemoPage + ApiDemoPage, PushPage ], imports: [ diff --git a/demos/nav-params/main.html b/demos/src/nav-params/main.html similarity index 100% rename from demos/nav-params/main.html rename to demos/src/nav-params/main.html diff --git a/demos/nav-params/page.html b/demos/src/nav-params/page.html similarity index 100% rename from demos/nav-params/page.html rename to demos/src/nav-params/page.html diff --git a/demos/navbar/AppModule.ts b/demos/src/navbar/AppModule.ts similarity index 82% rename from demos/navbar/AppModule.ts rename to demos/src/navbar/AppModule.ts index 4d6d152e18..4a385837d8 100644 --- a/demos/navbar/AppModule.ts +++ b/demos/src/navbar/AppModule.ts @@ -1,14 +1,14 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; // Use the toolbar demo but pass in the demo name to change the title @Component({ templateUrl: '../toolbar/main.html' }) export class ApiDemoPage { - demo = "Navbar"; - favorites = "recent"; - apps = "free"; + demo = 'Navbar'; + favorites = 'recent'; + apps = 'free'; } diff --git a/demos/navigation/AppModule.ts b/demos/src/navigation/AppModule.ts similarity index 77% rename from demos/navigation/AppModule.ts rename to demos/src/navigation/AppModule.ts index 07ad1f6055..957542a079 100644 --- a/demos/navigation/AppModule.ts +++ b/demos/src/navigation/AppModule.ts @@ -1,8 +1,7 @@ import { Component, NgModule } from '@angular/core'; -import { Config, IonicModule, NavController, NavParams, Platform } from 'ionic-angular'; - -var PAGE_NUM = 2; +import { IonicApp, IonicModule, NavController } from 'ionic-angular'; +let pageNum = 2; @Component({ templateUrl: 'main.html' @@ -16,21 +15,21 @@ export class ApiDemoPage { } @Component({ - templateUrl: "page.html" + templateUrl: 'page.html' }) export class PushPage { - pageNum = PAGE_NUM; + pageNum = pageNum; constructor(public navCtrl: NavController) {} push() { - PAGE_NUM++; + pageNum++; this.navCtrl.push(PushPage); } pop() { - if (PAGE_NUM > 2) { - PAGE_NUM--; + if (pageNum > 2) { + pageNum--; } this.navCtrl.pop(); } diff --git a/demos/navigation/main.html b/demos/src/navigation/main.html similarity index 100% rename from demos/navigation/main.html rename to demos/src/navigation/main.html diff --git a/demos/navigation/page.html b/demos/src/navigation/page.html similarity index 100% rename from demos/navigation/page.html rename to demos/src/navigation/page.html diff --git a/demos/output.ios.scss b/demos/src/output.ios.scss similarity index 100% rename from demos/output.ios.scss rename to demos/src/output.ios.scss diff --git a/demos/output.md.scss b/demos/src/output.md.scss similarity index 100% rename from demos/output.md.scss rename to demos/src/output.md.scss diff --git a/demos/output.wp.scss b/demos/src/output.wp.scss similarity index 100% rename from demos/output.wp.scss rename to demos/src/output.wp.scss diff --git a/demos/src/package.json b/demos/src/package.json new file mode 100644 index 0000000000..49a160a576 --- /dev/null +++ b/demos/src/package.json @@ -0,0 +1,11 @@ +{ + "name": "ionic-demos", + "private": true, + "version": "1.0.0", + "description": "demos of ionic framework", + "author": "Ionic Team (http://ionic.io)", + "license": "MIT", + "dependencies": { + "ionic-angular": "nightly" + } +} diff --git a/demos/platform/AppModule.ts b/demos/src/platform/AppModule.ts similarity index 91% rename from demos/platform/AppModule.ts rename to demos/src/platform/AppModule.ts index 3a48694d4a..73eb87a822 100644 --- a/demos/platform/AppModule.ts +++ b/demos/src/platform/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule, Platform } from 'ionic-angular'; +import { IonicApp, IonicModule, Platform } from 'ionic-angular'; @Component({ @@ -17,7 +17,6 @@ export class ApiDemoPage { } } - @Component({ template: '' }) diff --git a/demos/platform/main.html b/demos/src/platform/main.html similarity index 100% rename from demos/platform/main.html rename to demos/src/platform/main.html diff --git a/demos/popover/AppModule.ts b/demos/src/popover/AppModule.ts similarity index 96% rename from demos/popover/AppModule.ts rename to demos/src/popover/AppModule.ts index 4190cc2429..313c0d4533 100644 --- a/demos/popover/AppModule.ts +++ b/demos/src/popover/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule, ElementRef, ViewChild, ViewEncapsulation } from '@angular/core'; -import { IonicModule, NavParams, PopoverController } from 'ionic-angular'; +import { IonicApp, IonicModule, NavParams, PopoverController } from 'ionic-angular'; @Component({ @@ -102,8 +102,8 @@ export class PopoverRadioPage { if (!background) return 'white'; - for(var key in this.colors) { - if (this.colors[key].bg == background) { + for (var key in this.colors) { + if (this.colors[key].bg === background) { colorName = key; } } @@ -113,7 +113,7 @@ export class PopoverRadioPage { setFontFamily() { if (this.textEle.style.fontFamily) { - this.fontFamily = this.textEle.style.fontFamily.replace(/'/g, ""); + this.fontFamily = this.textEle.style.fontFamily.replace(/'/g, ''); } } diff --git a/demos/popover/main.html b/demos/src/popover/main.html similarity index 100% rename from demos/popover/main.html rename to demos/src/popover/main.html diff --git a/demos/popover/style.css b/demos/src/popover/style.css similarity index 100% rename from demos/popover/style.css rename to demos/src/popover/style.css diff --git a/demos/radio/AppModule.ts b/demos/src/radio/AppModule.ts similarity index 89% rename from demos/radio/AppModule.ts rename to demos/src/radio/AppModule.ts index c6173e0552..7480f8c10f 100644 --- a/demos/radio/AppModule.ts +++ b/demos/src/radio/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ @@ -9,7 +9,6 @@ export class ApiDemoPage { isDisabled = true; } - @Component({ template: '' }) diff --git a/demos/radio/main.html b/demos/src/radio/main.html similarity index 100% rename from demos/radio/main.html rename to demos/src/radio/main.html diff --git a/demos/range/AppModule.ts b/demos/src/range/AppModule.ts similarity index 87% rename from demos/range/AppModule.ts rename to demos/src/range/AppModule.ts index 6dfcd6a04a..694ecf2462 100644 --- a/demos/range/AppModule.ts +++ b/demos/src/range/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ templateUrl: 'main.html' @@ -11,7 +11,7 @@ export class ApiDemoPage { structure: any = {lower: 33, upper: 60}; onChange(ev) { - console.log("Changed", ev); + console.log('Changed', ev); } } diff --git a/demos/range/main.html b/demos/src/range/main.html similarity index 100% rename from demos/range/main.html rename to demos/src/range/main.html diff --git a/demos/refresher/AppModule.ts b/demos/src/refresher/AppModule.ts similarity index 94% rename from demos/refresher/AppModule.ts rename to demos/src/refresher/AppModule.ts index 59f8e100e3..d19c6876da 100644 --- a/demos/refresher/AppModule.ts +++ b/demos/src/refresher/AppModule.ts @@ -1,6 +1,6 @@ import { Component, NgModule, Injectable } from '@angular/core'; -import { IonicModule, Refresher } from 'ionic-angular'; +import { IonicApp, IonicModule, Refresher } from 'ionic-angular'; /** @@ -9,7 +9,7 @@ import { IonicModule, Refresher } from 'ionic-angular'; @Injectable() export class MockProvider { - getData() { + getData(): any[] { // return mock data synchronously let data = []; for (var i = 0; i < 3; i++) { @@ -18,7 +18,7 @@ export class MockProvider { return data; } - getAsyncData() { + getAsyncData(): Promise { // async receive mock data return new Promise(resolve => { diff --git a/demos/refresher/main.html b/demos/src/refresher/main.html similarity index 100% rename from demos/refresher/main.html rename to demos/src/refresher/main.html diff --git a/demos/scroll/AppModule.ts b/demos/src/scroll/AppModule.ts similarity index 89% rename from demos/scroll/AppModule.ts rename to demos/src/scroll/AppModule.ts index c86fdfc598..739a83c887 100644 --- a/demos/scroll/AppModule.ts +++ b/demos/src/scroll/AppModule.ts @@ -1,6 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ diff --git a/demos/scroll/main.html b/demos/src/scroll/main.html similarity index 100% rename from demos/scroll/main.html rename to demos/src/scroll/main.html diff --git a/demos/scroll/map.jpeg b/demos/src/scroll/map.jpeg similarity index 100% rename from demos/scroll/map.jpeg rename to demos/src/scroll/map.jpeg diff --git a/demos/scrollbar-fix.css b/demos/src/scrollbar-fix.css similarity index 100% rename from demos/scrollbar-fix.css rename to demos/src/scrollbar-fix.css diff --git a/demos/scrollbar-fix.js b/demos/src/scrollbar-fix.js similarity index 100% rename from demos/scrollbar-fix.js rename to demos/src/scrollbar-fix.js diff --git a/demos/searchbar/AppModule.ts b/demos/src/searchbar/AppModule.ts similarity index 94% rename from demos/searchbar/AppModule.ts rename to demos/src/searchbar/AppModule.ts index c20d84e686..bf51ed793d 100644 --- a/demos/searchbar/AppModule.ts +++ b/demos/src/searchbar/AppModule.ts @@ -1,6 +1,6 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ diff --git a/demos/searchbar/main.html b/demos/src/searchbar/main.html similarity index 100% rename from demos/searchbar/main.html rename to demos/src/searchbar/main.html diff --git a/demos/segment/AppModule.ts b/demos/src/segment/AppModule.ts similarity index 85% rename from demos/segment/AppModule.ts rename to demos/src/segment/AppModule.ts index 9d7c558854..d38fb013dc 100644 --- a/demos/segment/AppModule.ts +++ b/demos/src/segment/AppModule.ts @@ -1,18 +1,18 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ templateUrl: 'main.html' }) export class ApiDemoPage { - appType = "Paid"; - safari = "Shared Links"; - weather = "sunny"; + appType = 'Paid'; + safari = 'Shared Links'; + weather = 'sunny'; apps = { - "Paid": [ + 'Paid': [ { name: 'Monopoly', price: '$0.99' @@ -22,7 +22,7 @@ export class ApiDemoPage { price: '$2.99' } ], - "Free": [ + 'Free': [ { name: 'Snapchat', price: 'GET' @@ -32,7 +32,7 @@ export class ApiDemoPage { price: 'OPEN' } ], - "Top": [ + 'Top': [ { name: 'Spotify', price: 'OPEN' @@ -45,7 +45,7 @@ export class ApiDemoPage { }; items = { - "Bookmarks": [ + 'Bookmarks': [ { name: 'Favorites', icon: 'ios-star-outline' @@ -55,7 +55,7 @@ export class ApiDemoPage { icon: 'ios-clock-outline' } ], - "Reading List": [ + 'Reading List': [ { name: 'Terms of Service', icon: 'create' @@ -65,7 +65,7 @@ export class ApiDemoPage { icon: 'book' } ], - "Shared Links": [ + 'Shared Links': [ { name: 'Ionic Framework', icon: 'ionic' @@ -107,4 +107,5 @@ export class ApiDemoApp { ApiDemoPage ] }) -export class AppModule {}); +export class AppModule {} + diff --git a/demos/segment/main.html b/demos/src/segment/main.html similarity index 100% rename from demos/segment/main.html rename to demos/src/segment/main.html diff --git a/demos/select/AppModule.ts b/demos/src/select/AppModule.ts similarity index 95% rename from demos/select/AppModule.ts rename to demos/src/select/AppModule.ts index e2a9f19ead..bf1c43b6ae 100644 --- a/demos/select/AppModule.ts +++ b/demos/src/select/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ templateUrl: 'main.html' diff --git a/demos/select/main.html b/demos/src/select/main.html similarity index 100% rename from demos/select/main.html rename to demos/src/select/main.html diff --git a/demos/src/show-when/AppModule.ts b/demos/src/show-when/AppModule.ts new file mode 100644 index 0000000000..de83210338 --- /dev/null +++ b/demos/src/show-when/AppModule.ts @@ -0,0 +1,30 @@ +import { Component, NgModule } from '@angular/core'; +import { IonicApp, IonicModule } from 'ionic-angular'; + +@Component({ + templateUrl: 'main.html' +}) +export class ApiDemoPage {} + + +@Component({ + template: '' +}) +export class ApiDemoApp { + root = ApiDemoPage; +} + +@NgModule({ + declarations: [ + ApiDemoApp, + ApiDemoPage + ], + imports: [ + IonicModule.forRoot(ApiDemoApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + ApiDemoPage + ] +}) +export class AppModule {} diff --git a/demos/show-when/main.html b/demos/src/show-when/main.html similarity index 100% rename from demos/show-when/main.html rename to demos/src/show-when/main.html diff --git a/demos/src/slides/AppModule.ts b/demos/src/slides/AppModule.ts new file mode 100644 index 0000000000..de83210338 --- /dev/null +++ b/demos/src/slides/AppModule.ts @@ -0,0 +1,30 @@ +import { Component, NgModule } from '@angular/core'; +import { IonicApp, IonicModule } from 'ionic-angular'; + +@Component({ + templateUrl: 'main.html' +}) +export class ApiDemoPage {} + + +@Component({ + template: '' +}) +export class ApiDemoApp { + root = ApiDemoPage; +} + +@NgModule({ + declarations: [ + ApiDemoApp, + ApiDemoPage + ], + imports: [ + IonicModule.forRoot(ApiDemoApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + ApiDemoPage + ] +}) +export class AppModule {} diff --git a/demos/slides/main.html b/demos/src/slides/main.html similarity index 100% rename from demos/slides/main.html rename to demos/src/slides/main.html diff --git a/demos/slides/slide1.jpeg b/demos/src/slides/slide1.jpeg similarity index 100% rename from demos/slides/slide1.jpeg rename to demos/src/slides/slide1.jpeg diff --git a/demos/slides/slide2.jpeg b/demos/src/slides/slide2.jpeg similarity index 100% rename from demos/slides/slide2.jpeg rename to demos/src/slides/slide2.jpeg diff --git a/demos/slides/slide3.jpeg b/demos/src/slides/slide3.jpeg similarity index 100% rename from demos/slides/slide3.jpeg rename to demos/src/slides/slide3.jpeg diff --git a/demos/slides/slide4.jpeg b/demos/src/slides/slide4.jpeg similarity index 100% rename from demos/slides/slide4.jpeg rename to demos/src/slides/slide4.jpeg diff --git a/demos/slides/slide5.jpeg b/demos/src/slides/slide5.jpeg similarity index 100% rename from demos/slides/slide5.jpeg rename to demos/src/slides/slide5.jpeg diff --git a/demos/tabs/AppModule.ts b/demos/src/tabs/AppModule.ts similarity index 92% rename from demos/tabs/AppModule.ts rename to demos/src/tabs/AppModule.ts index 830c6ab4d5..9e78a03b8e 100644 --- a/demos/tabs/AppModule.ts +++ b/demos/src/tabs/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule, ViewEncapsulation } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ template: 'tab', diff --git a/demos/tabs/main.html b/demos/src/tabs/main.html similarity index 100% rename from demos/tabs/main.html rename to demos/src/tabs/main.html diff --git a/demos/tabs/style.css b/demos/src/tabs/style.css similarity index 100% rename from demos/tabs/style.css rename to demos/src/tabs/style.css diff --git a/demos/src/textarea/AppModule.ts b/demos/src/textarea/AppModule.ts new file mode 100644 index 0000000000..de83210338 --- /dev/null +++ b/demos/src/textarea/AppModule.ts @@ -0,0 +1,30 @@ +import { Component, NgModule } from '@angular/core'; +import { IonicApp, IonicModule } from 'ionic-angular'; + +@Component({ + templateUrl: 'main.html' +}) +export class ApiDemoPage {} + + +@Component({ + template: '' +}) +export class ApiDemoApp { + root = ApiDemoPage; +} + +@NgModule({ + declarations: [ + ApiDemoApp, + ApiDemoPage + ], + imports: [ + IonicModule.forRoot(ApiDemoApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + ApiDemoPage + ] +}) +export class AppModule {} diff --git a/demos/textarea/main.html b/demos/src/textarea/main.html similarity index 100% rename from demos/textarea/main.html rename to demos/src/textarea/main.html diff --git a/demos/title/AppModule.ts b/demos/src/title/AppModule.ts similarity index 84% rename from demos/title/AppModule.ts rename to demos/src/title/AppModule.ts index 97ba0f82f7..15a7e3fb8b 100644 --- a/demos/title/AppModule.ts +++ b/demos/src/title/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; // Use the toolbar demo but pass in the demo name to change the title // this will also hide some of the toolbars that don't use `ion-title` @@ -7,9 +7,9 @@ import { IonicModule } from 'ionic-angular'; templateUrl: '../toolbar/main.html' }) export class ApiDemoPage { - demo = "Title"; - favorites = "recent"; - apps = "free"; + demo = 'Title'; + favorites = 'recent'; + apps = 'free'; } diff --git a/demos/toast/AppModule.ts b/demos/src/toast/AppModule.ts similarity index 96% rename from demos/toast/AppModule.ts rename to demos/src/toast/AppModule.ts index df0a4bce49..1d2f753785 100644 --- a/demos/toast/AppModule.ts +++ b/demos/src/toast/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule, ToastController } from 'ionic-angular'; +import { IonicApp, IonicModule, ToastController } from 'ionic-angular'; @Component({ templateUrl: 'main.html' diff --git a/demos/toast/main.html b/demos/src/toast/main.html similarity index 100% rename from demos/toast/main.html rename to demos/src/toast/main.html diff --git a/demos/toggle/AppModule.ts b/demos/src/toggle/AppModule.ts similarity index 92% rename from demos/toggle/AppModule.ts rename to demos/src/toggle/AppModule.ts index 72ee62b68e..7db4a3153e 100644 --- a/demos/toggle/AppModule.ts +++ b/demos/src/toggle/AppModule.ts @@ -1,5 +1,5 @@ import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; +import { IonicApp, IonicModule } from 'ionic-angular'; @Component({ templateUrl: 'main.html' diff --git a/demos/toggle/main.html b/demos/src/toggle/main.html similarity index 100% rename from demos/toggle/main.html rename to demos/src/toggle/main.html diff --git a/demos/src/toolbar/AppModule.ts b/demos/src/toolbar/AppModule.ts new file mode 100644 index 0000000000..79abca60c5 --- /dev/null +++ b/demos/src/toolbar/AppModule.ts @@ -0,0 +1,33 @@ +import { Component, NgModule } from '@angular/core'; +import { IonicApp, IonicModule } from 'ionic-angular'; + +@Component({ + templateUrl: 'main.html' +}) +export class ApiDemoPage { + demo = 'Toolbar'; + favorites = 'recent'; + apps = 'free'; +} + +@Component({ + template: '' +}) +export class ApiDemoApp { + root = ApiDemoPage; +} + +@NgModule({ + declarations: [ + ApiDemoApp, + ApiDemoPage + ], + imports: [ + IonicModule.forRoot(ApiDemoApp) + ], + bootstrap: [IonicApp], + entryComponents: [ + ApiDemoPage + ] +}) +export class AppModule {} diff --git a/demos/toolbar/main.html b/demos/src/toolbar/main.html similarity index 100% rename from demos/toolbar/main.html rename to demos/src/toolbar/main.html diff --git a/demos/textarea/AppModule.ts b/demos/textarea/AppModule.ts deleted file mode 100644 index e1d485cf11..0000000000 --- a/demos/textarea/AppModule.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Component, NgModule } from '@angular/core'; -import { IonicModule } from 'ionic-angular'; - -@Component({ - templateUrl: 'main.html' -}) -export class ApiDemoPage {} - - -@Component({ - template: '' -}) -export class ApiDemoApp { - root = ApiDemoPage; -} - -@NgModule({ - declarations: [ - ApiDemoApp, - ApiDemoPage - ], - imports: [ - IonicModule.forRoot(ApiDemoApp) - ], - bootstrap: [IonicApp], - entryComponents: [ - ApiDemoPage - ] -}) -export class AppModule {}