File tree Expand file tree Collapse file tree 1 file changed +16
-8
lines changed Expand file tree Collapse file tree 1 file changed +16
-8
lines changed Original file line number Diff line number Diff line change @@ -618,16 +618,21 @@ export class Animation {
618
618
}
619
619
620
620
if ( Object . keys ( this . _fx ) . length ) {
621
+ easing = ( forcedLinearEasing ? 'linear' : this . getEasing ( ) ) ;
621
622
for ( i = 0 ; i < this . _el . length ; i ++ ) {
622
- // all parent/child animations should have the same duration
623
- // ******** DOM WRITE ****************
624
- this . _el [ i ] . style [ CSS . transitionDuration ] = duration + 'ms' ;
625
-
626
- // each animation can have a different easing
627
- easing = ( forcedLinearEasing ? 'linear' : this . getEasing ( ) ) ;
628
- if ( easing ) {
623
+ if ( duration > 0 ) {
624
+ // all parent/child animations should have the same duration
629
625
// ******** DOM WRITE ****************
630
- this . _el [ i ] . style [ CSS . transitionTimingFn ] = easing ;
626
+ this . _el [ i ] . style [ CSS . transition ] = '' ;
627
+ this . _el [ i ] . style [ CSS . transitionDuration ] = duration + 'ms' ;
628
+
629
+ // each animation can have a different easing
630
+ if ( easing ) {
631
+ // ******** DOM WRITE ****************
632
+ this . _el [ i ] . style [ CSS . transitionTimingFn ] = easing ;
633
+ }
634
+ } else {
635
+ this . _el [ i ] . style [ CSS . transition ] = 'none' ;
631
636
}
632
637
}
633
638
}
@@ -824,6 +829,9 @@ export class Animation {
824
829
this . _c [ i ] . progressStart ( ) ;
825
830
}
826
831
832
+ // ******** DOM WRITE ****************
833
+ this . _willChg ( true ) ;
834
+
827
835
// ******** DOM WRITE ****************
828
836
this . _before ( ) ;
829
837
You can’t perform that action at this time.
0 commit comments