skills/angular__angular
1
0
Fork 0
mirror of https://github.com/angular/angular.git synced 2026-09-14 13:54:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(animations): handle structured AnimateTimings (#31107)

Browse Source 
This commit makes sure structured AnimateTimings are not procesed any further when building the AST.

Fixes: #22752

PR Close #31107
This commit is contained in:
Christoph Guttandin
2019-06-18 16:50:59 +02:00
committed by Andrew Kushnir
parent 035ba83b16
commit 29d3891782
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/animations/browser/src/dsl/animation_ast_builder.ts
+5 -4
View File
@@ -561,10 +561,11 @@ function consumeOffset(styles: OffsetStyles|Array<OffsetStyles>): number|null {
}
function constructTimingAst(value: string|number|AnimateTimings, errors: Error[]) {
let timings: AnimateTimings|null = null;
if (value.hasOwnProperty('duration')) {
timings = value as AnimateTimings;
} else if (typeof value == 'number') {
return value as AnimateTimings;
}
if (typeof value == 'number') {
const duration = resolveTiming(value, errors).duration;
return makeTimingAst(duration, 0, '');
}
@@ -578,7 +579,7 @@ function constructTimingAst(value: string|number|AnimateTimings, errors: Error[]
return ast as DynamicTimingAst;
}
timings = timings || resolveTiming(strValue, errors);
const timings = resolveTiming(strValue, errors);
return makeTimingAst(timings.duration, timings.delay, timings.easing);
}