cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(animations): allow group() to be used as entry point for an animation trigger (#11419)

Browse Source 
Closes #11312
Closes #11419
This commit is contained in:
Matias Niemelä
2016-09-08 12:20:07 -07:00
committed by Evan Martin
parent f78e184822
commit 6a2bbffe10
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/@angular/compiler/src/animation/animation_ast.ts
View File

@ -52,7 +52,7 @@ export class AnimationStateTransitionExpression {
export class AnimationStateTransitionAst extends AnimationStateAst {
constructor(
public stateChanges: AnimationStateTransitionExpression[],
public animation: AnimationSequenceAst) {
public animation: AnimationWithStepsAst) {
super();
}
visit(visitor: AnimationAstVisitor, context: any): any {

10
modules/@angular/compiler/src/animation/animation_parser.ts
View File

@ -117,11 +117,11 @@ function _parseAnimationStateTransition(
_fillAnimationAstStartingKeyframes(animationAst, styles, errors);
}
var sequenceAst = (animationAst instanceof AnimationSequenceAst) ?
<AnimationSequenceAst>animationAst :
var stepsAst: AnimationWithStepsAst = (animationAst instanceof AnimationWithStepsAst) ?
animationAst :
new AnimationSequenceAst([animationAst]);
return new AnimationStateTransitionAst(transitionExprs, sequenceAst);
return new AnimationStateTransitionAst(transitionExprs, stepsAst);
}
function _parseAnimationTransitionExpr(
@ -180,7 +180,9 @@ function _normalizeStyleSteps(
entry: CompileAnimationMetadata, stateStyles: {[key: string]: AnimationStylesAst},
errors: AnimationParseError[]): CompileAnimationMetadata {
var steps = _normalizeStyleStepEntry(entry, stateStyles, errors);
return new CompileAnimationSequenceMetadata(steps);
return (entry instanceof CompileAnimationGroupMetadata) ?
new CompileAnimationGroupMetadata(steps) :
new CompileAnimationSequenceMetadata(steps);
}
function _mergeAnimationStyles(