From 1158a96288004f34ead58fa1a933aa3977a74347 Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Fri, 16 Sep 2016 11:09:09 -0500 Subject: [PATCH] chore(build): all demos build in ngc w/ 2.0.0 all demos build in ngc w/ 2.0.0 --- demos/package.json | 14 +------------- demos/src/modal/app.component.ts | 33 +------------------------------- demos/tsconfig.json | 4 ++-- 3 files changed, 4 insertions(+), 47 deletions(-) diff --git a/demos/package.json b/demos/package.json index 352f631362..d5f5f4f0e6 100644 --- a/demos/package.json +++ b/demos/package.json @@ -6,23 +6,11 @@ "author": "Ionic Team (http://ionic.io)", "license": "MIT", "dependencies": { - "@angular/common": "2.0.0-rc.7", - "@angular/compiler": "2.0.0-rc.7", - "@angular/core": "2.0.0-rc.7", - "@angular/forms": "2.0.0-rc.7", - "@angular/http": "2.0.0-rc.7", - "@angular/platform-browser": "2.0.0-rc.7", - "@angular/platform-browser-dynamic": "2.0.0-rc.7", - "@angular/platform-server": "2.0.0-rc.7", "ionic-angular": "nightly", - "ionic-native": "1.3.20", - "ionicons": "3.0.0", - "rxjs-es": "5.0.0-beta.12", - "zone.js": "^0.6.23" + "ionicons": "3.0.0" }, "devDependencies": { "@angular/compiler-cli": "0.6.2", - "@ionic/app-scripts": "latest", "typescript": "2.0.2" } } diff --git a/demos/src/modal/app.component.ts b/demos/src/modal/app.component.ts index 262a90830f..e4922a6542 100644 --- a/demos/src/modal/app.component.ts +++ b/demos/src/modal/app.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { Animation, ModalController, NavParams, ViewController } from 'ionic-angular'; +import { ModalController, NavParams, ViewController } from 'ionic-angular'; @Component({ @@ -19,12 +19,6 @@ export class ModalFirstPage { let myModal = this.modalCtrl.create(ModalContentPage, { 'myParam': this.myParam }); myModal.present(); } - openCustomAnimationModal() { - let myModal = this.modalCtrl.create(ModalContentPage, { - animation: 'my-fade-in', - }); - myModal.present(); - } } @@ -53,28 +47,3 @@ export class ModalContentPage { export class ApiDemoApp { root = ModalFirstPage; } - -export class FadeIn extends Animation { - constructor(enteringView: ViewController, leavingView: ViewController) { - super(enteringView.pageRef()); - this - .easing('ease') - .duration(1000) - .fromTo('translateY', '0%', '0%') - .fromTo('opacity', 0, 1) - .beforeAddClass('show-page'); - } -} -Animation.register('my-fade-in', FadeIn); - -export class FadeOut extends Animation { - constructor(enteringView: ViewController, leavingView: ViewController) { - super(leavingView.pageRef()); - this - .easing('ease') - .duration(500) - .fromTo('opacity', 1, 0) - .beforeAddClass('show-page'); - } -} -Animation.register('my-fade-out', FadeOut); diff --git a/demos/tsconfig.json b/demos/tsconfig.json index b9b8f2b854..d0bfe7ed6c 100644 --- a/demos/tsconfig.json +++ b/demos/tsconfig.json @@ -13,8 +13,8 @@ "types": ["jasmine", "protractor"] }, "include": [ - "./src/toolbar/app.module.ts", - "./src/toolbar/main.ts" + "./src/**/app.module.ts", + "./src/**/main.ts" ], "compileOnSave": false, "buildOnSave": false,