Browse Source

Animations fix

pull/1/head
Sebastian 9 years ago
parent
commit
12654fb1ec
  1. 2
      src/Squidex/app/components/internal/app/settings/clients-page.component.ts
  2. 2
      src/Squidex/app/components/internal/apps/apps-page.component.ts
  3. 2
      src/Squidex/app/components/layout/app-form.component.ts
  4. 2
      src/Squidex/app/components/layout/apps-menu.component.ts
  5. 2
      src/Squidex/app/components/layout/profile-menu.component.ts
  6. 6
      src/Squidex/app/framework/angular/animations.ts
  7. 6
      src/Squidex/app/framework/module.ts
  8. 4
      src/Squidex/package.json

2
src/Squidex/app/components/internal/app/settings/clients-page.component.ts

@ -22,7 +22,7 @@ import {
styles, styles,
template, template,
animations: [ animations: [
fadeAnimation() fadeAnimation
] ]
}) })
export class ClientsPageComponent implements Ng2.OnInit { export class ClientsPageComponent implements Ng2.OnInit {

2
src/Squidex/app/components/internal/apps/apps-page.component.ts

@ -19,7 +19,7 @@ import {
styles, styles,
template, template,
animations: [ animations: [
fadeAnimation() fadeAnimation
] ]
}) })
export class AppsPageComponent implements Ng2.OnInit { export class AppsPageComponent implements Ng2.OnInit {

2
src/Squidex/app/components/layout/app-form.component.ts

@ -21,7 +21,7 @@ const FALLBACK_NAME = 'my-app';
selector: 'sqx-app-form', selector: 'sqx-app-form',
template, template,
animations: [ animations: [
fadeAnimation() fadeAnimation
] ]
}) })
export class AppFormComponent implements Ng2.OnInit { export class AppFormComponent implements Ng2.OnInit {

2
src/Squidex/app/components/layout/apps-menu.component.ts

@ -22,7 +22,7 @@ const FALLBACK_NAME = 'Apps Overview';
styles, styles,
template, template,
animations: [ animations: [
fadeAnimation() fadeAnimation
] ]
}) })
export class AppsMenuComponent implements Ng2.OnInit, Ng2.OnDestroy { export class AppsMenuComponent implements Ng2.OnInit, Ng2.OnDestroy {

2
src/Squidex/app/components/layout/profile-menu.component.ts

@ -18,7 +18,7 @@ import {
styles, styles,
template, template,
animations: [ animations: [
fadeAnimation() fadeAnimation
] ]
}) })
export class ProfileMenuComponent implements Ng2.OnInit, Ng2.OnDestroy { export class ProfileMenuComponent implements Ng2.OnInit, Ng2.OnDestroy {

6
src/Squidex/app/framework/angular/animations.ts

@ -7,7 +7,7 @@
import * as Ng2 from '@angular/core'; 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( return Ng2.trigger(
name, [ name, [
Ng2.transition(':enter', [ 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( return Ng2.trigger(
name, [ name, [
Ng2.transition(':enter', [ Ng2.transition(':enter', [
@ -53,3 +53,5 @@ export const heightAnimation = (name = 'height', timing = '200ms'): Ng2.Animatio
); );
}; };
export const fadeAnimation = buildfadeAnimation;

6
src/Squidex/app/framework/module.ts

@ -16,8 +16,10 @@ import {
ColorPickerComponent, ColorPickerComponent,
DayOfWeekPipe, DayOfWeekPipe,
DayPipe, DayPipe,
DragModelDirective,
DurationPipe, DurationPipe,
FocusOnChangeDirective, FocusOnChangeDirective,
ImageDropDirective,
ModalViewDirective, ModalViewDirective,
MoneyPipe, MoneyPipe,
MonthPipe, MonthPipe,
@ -42,8 +44,10 @@ import {
ColorPickerComponent, ColorPickerComponent,
DayOfWeekPipe, DayOfWeekPipe,
DayPipe, DayPipe,
DragModelDirective,
DurationPipe, DurationPipe,
FocusOnChangeDirective, FocusOnChangeDirective,
ImageDropDirective,
ModalViewDirective, ModalViewDirective,
MoneyPipe, MoneyPipe,
MonthPipe, MonthPipe,
@ -59,8 +63,10 @@ import {
ColorPickerComponent, ColorPickerComponent,
DayOfWeekPipe, DayOfWeekPipe,
DayPipe, DayPipe,
DragModelDirective,
DurationPipe, DurationPipe,
FocusOnChangeDirective, FocusOnChangeDirective,
ImageDropDirective,
ModalViewDirective, ModalViewDirective,
MoneyPipe, MoneyPipe,
MonthPipe, MonthPipe,

4
src/Squidex/package.json

@ -37,6 +37,8 @@
"zone.js": "^0.6.23" "zone.js": "^0.6.23"
}, },
"devDependencies": { "devDependencies": {
"@angular/compiler-cli": "^2.2.3",
"@ngtools/webpack": "^1.1.6",
"@types/core-js": "^0.9.34", "@types/core-js": "^0.9.34",
"@types/jasmine": "^2.5.38", "@types/jasmine": "^2.5.38",
"@types/mousetrap": "^1.5.32", "@types/mousetrap": "^1.5.32",
@ -74,7 +76,7 @@
"tslint": "^4.0.2", "tslint": "^4.0.2",
"tslint-loader": "^3.2.0", "tslint-loader": "^3.2.0",
"typemoq": "^0.3.2", "typemoq": "^0.3.2",
"typescript": "^2.0.10", "typescript": "2.0.10",
"underscore": "^1.8.3", "underscore": "^1.8.3",
"webpack": "2.1.0-beta.25", "webpack": "2.1.0-beta.25",
"webpack-dev-server": "2.1.0-beta.10", "webpack-dev-server": "2.1.0-beta.10",

Loading…
Cancel
Save