@@ -13,7 +13,8 @@ import {
1313 setStyles ,
1414} from "./dom-utils" ;
1515
16- const MARKED_FOR_ANIMATION = "ng-animate" ;
16+ const MARKED_FOR_ANIMATION_CLASSNAME = "ng-animating" ;
17+ const MARKED_FOR_ANIMATION_SELECTOR = ".ng-animating" ;
1718
1819interface QueuedAnimationTransitionTuple {
1920 element : NgView ;
@@ -50,9 +51,9 @@ export class NativeScriptAnimationEngine extends DomAnimationEngine {
5051 // we first run this so that the previous animation player
5152 // data can be passed into the successive animation players
5253 let totalTime = 0 ;
53- const players = instruction . timelines . map ( timelineInstruction => {
54+ const players = instruction . timelines . map ( ( timelineInstruction , i ) => {
5455 totalTime = Math . max ( totalTime , timelineInstruction . totalTime ) ;
55- return ( < any > this ) . _buildPlayer ( element , timelineInstruction , previousPlayers ) ;
56+ return ( < any > this ) . _buildPlayer ( element , timelineInstruction , previousPlayers , i ) ;
5657 } ) ;
5758
5859 previousPlayers . forEach ( previousPlayer => previousPlayer . destroy ( ) ) ;
@@ -91,7 +92,7 @@ export class NativeScriptAnimationEngine extends DomAnimationEngine {
9192 // them out by destroying each of them.
9293 let elms = [ ] ;
9394 ( < any > element ) . _eachChildView ( child => {
94- if ( cssClasses ( < NgView > child ) . get ( MARKED_FOR_ANIMATION ) ) {
95+ if ( cssClasses ( < NgView > child ) . get ( MARKED_FOR_ANIMATION_SELECTOR ) ) {
9596 elms . push ( child ) ;
9697 }
9798
@@ -129,8 +130,8 @@ export class NativeScriptAnimationEngine extends DomAnimationEngine {
129130 ( < any > this ) . _queuedTransitionAnimations . push ( tuple ) ;
130131 player . init ( ) ;
131132
132- cssClasses ( element ) . set ( MARKED_FOR_ANIMATION , true ) ;
133- player . onDone ( ( ) => cssClasses ( element ) . set ( MARKED_FOR_ANIMATION , false ) ) ;
133+ cssClasses ( element ) . set ( MARKED_FOR_ANIMATION_CLASSNAME , true ) ;
134+ player . onDone ( ( ) => cssClasses ( element ) . set ( MARKED_FOR_ANIMATION_CLASSNAME , false ) ) ;
134135 }
135136
136137 private _getElementAnimation ( element : NgView ) {
0 commit comments