From 12654fb1ecf4fb1acb36e4b46d4a303cfad29e15 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sat, 26 Nov 2016 13:42:19 +0100 Subject: [PATCH] Animations fix --- .../internal/app/settings/clients-page.component.ts | 2 +- .../app/components/internal/apps/apps-page.component.ts | 2 +- src/Squidex/app/components/layout/app-form.component.ts | 2 +- src/Squidex/app/components/layout/apps-menu.component.ts | 2 +- src/Squidex/app/components/layout/profile-menu.component.ts | 2 +- src/Squidex/app/framework/angular/animations.ts | 6 ++++-- src/Squidex/app/framework/module.ts | 6 ++++++ src/Squidex/package.json | 4 +++- 8 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/Squidex/app/components/internal/app/settings/clients-page.component.ts b/src/Squidex/app/components/internal/app/settings/clients-page.component.ts index 0f577e9f3..eace94e51 100644 --- a/src/Squidex/app/components/internal/app/settings/clients-page.component.ts +++ b/src/Squidex/app/components/internal/app/settings/clients-page.component.ts @@ -22,7 +22,7 @@ import { styles, template, animations: [ - fadeAnimation() + fadeAnimation ] }) export class ClientsPageComponent implements Ng2.OnInit { diff --git a/src/Squidex/app/components/internal/apps/apps-page.component.ts b/src/Squidex/app/components/internal/apps/apps-page.component.ts index 06c1e05f1..2d7ac8e9b 100644 --- a/src/Squidex/app/components/internal/apps/apps-page.component.ts +++ b/src/Squidex/app/components/internal/apps/apps-page.component.ts @@ -19,7 +19,7 @@ import { styles, template, animations: [ - fadeAnimation() + fadeAnimation ] }) export class AppsPageComponent implements Ng2.OnInit { diff --git a/src/Squidex/app/components/layout/app-form.component.ts b/src/Squidex/app/components/layout/app-form.component.ts index a7cae0dc6..0a7331943 100644 --- a/src/Squidex/app/components/layout/app-form.component.ts +++ b/src/Squidex/app/components/layout/app-form.component.ts @@ -21,7 +21,7 @@ const FALLBACK_NAME = 'my-app'; selector: 'sqx-app-form', template, animations: [ - fadeAnimation() + fadeAnimation ] }) export class AppFormComponent implements Ng2.OnInit { diff --git a/src/Squidex/app/components/layout/apps-menu.component.ts b/src/Squidex/app/components/layout/apps-menu.component.ts index 58b1d36ad..32556a677 100644 --- a/src/Squidex/app/components/layout/apps-menu.component.ts +++ b/src/Squidex/app/components/layout/apps-menu.component.ts @@ -22,7 +22,7 @@ const FALLBACK_NAME = 'Apps Overview'; styles, template, animations: [ - fadeAnimation() + fadeAnimation ] }) export class AppsMenuComponent implements Ng2.OnInit, Ng2.OnDestroy { diff --git a/src/Squidex/app/components/layout/profile-menu.component.ts b/src/Squidex/app/components/layout/profile-menu.component.ts index 81e159785..0d734e5f4 100644 --- a/src/Squidex/app/components/layout/profile-menu.component.ts +++ b/src/Squidex/app/components/layout/profile-menu.component.ts @@ -18,7 +18,7 @@ import { styles, template, animations: [ - fadeAnimation() + fadeAnimation ] }) export class ProfileMenuComponent implements Ng2.OnInit, Ng2.OnDestroy { diff --git a/src/Squidex/app/framework/angular/animations.ts b/src/Squidex/app/framework/angular/animations.ts index 1cf9b4884..001363375 100644 --- a/src/Squidex/app/framework/angular/animations.ts +++ b/src/Squidex/app/framework/angular/animations.ts @@ -7,7 +7,7 @@ import * as Ng2 from '@angular/core'; -export const fadeAnimation = (name = 'fade', timing = '200ms'): Ng2.AnimationEntryMetadata => { +function buildFadeAnimation(name = 'fade', timing = '200ms'): Ng2.AnimationEntryMetadata { return Ng2.trigger( name, [ Ng2.transition(':enter', [ @@ -30,7 +30,7 @@ export const fadeAnimation = (name = 'fade', timing = '200ms'): Ng2.AnimationEnt ); }; -export const heightAnimation = (name = 'height', timing = '200ms'): Ng2.AnimationEntryMetadata => { +function buildHeightAnimation(name = 'height', timing = '200ms'): Ng2.AnimationEntryMetadata { return Ng2.trigger( name, [ Ng2.transition(':enter', [ @@ -52,4 +52,6 @@ export const heightAnimation = (name = 'height', timing = '200ms'): Ng2.Animatio ] ); }; + +export const fadeAnimation = buildfadeAnimation; \ No newline at end of file diff --git a/src/Squidex/app/framework/module.ts b/src/Squidex/app/framework/module.ts index 3e2482e16..6c7b584db 100644 --- a/src/Squidex/app/framework/module.ts +++ b/src/Squidex/app/framework/module.ts @@ -16,8 +16,10 @@ import { ColorPickerComponent, DayOfWeekPipe, DayPipe, + DragModelDirective, DurationPipe, FocusOnChangeDirective, + ImageDropDirective, ModalViewDirective, MoneyPipe, MonthPipe, @@ -42,8 +44,10 @@ import { ColorPickerComponent, DayOfWeekPipe, DayPipe, + DragModelDirective, DurationPipe, FocusOnChangeDirective, + ImageDropDirective, ModalViewDirective, MoneyPipe, MonthPipe, @@ -59,8 +63,10 @@ import { ColorPickerComponent, DayOfWeekPipe, DayPipe, + DragModelDirective, DurationPipe, FocusOnChangeDirective, + ImageDropDirective, ModalViewDirective, MoneyPipe, MonthPipe, diff --git a/src/Squidex/package.json b/src/Squidex/package.json index 2efbcfae6..c75e01225 100644 --- a/src/Squidex/package.json +++ b/src/Squidex/package.json @@ -37,6 +37,8 @@ "zone.js": "^0.6.23" }, "devDependencies": { + "@angular/compiler-cli": "^2.2.3", + "@ngtools/webpack": "^1.1.6", "@types/core-js": "^0.9.34", "@types/jasmine": "^2.5.38", "@types/mousetrap": "^1.5.32", @@ -74,7 +76,7 @@ "tslint": "^4.0.2", "tslint-loader": "^3.2.0", "typemoq": "^0.3.2", - "typescript": "^2.0.10", + "typescript": "2.0.10", "underscore": "^1.8.3", "webpack": "2.1.0-beta.25", "webpack-dev-server": "2.1.0-beta.10",