This repository was archived by the owner on Apr 12, 2024. It is now read-only.
File tree 2 files changed +2
-1
lines changed
2 files changed +2
-1
lines changed Original file line number Diff line number Diff line change @@ -1141,7 +1141,7 @@ angular.module('ngAnimate', ['ng'])
1141
1141
var propertyStyle = timings . transitionPropertyStyle ;
1142
1142
if ( propertyStyle . indexOf ( 'all' ) == - 1 ) {
1143
1143
style += CSS_PREFIX + 'transition-property: ' + propertyStyle + ';' ;
1144
- style += CSS_PREFIX + 'transition-duration: ' + timings . transitionDurationStyle + 's ;' ;
1144
+ style += CSS_PREFIX + 'transition-duration: ' + timings . transitionDurationStyle + ';' ;
1145
1145
appliedStyles . push ( CSS_PREFIX + 'transition-property' ) ;
1146
1146
appliedStyles . push ( CSS_PREFIX + 'transition-duration' ) ;
1147
1147
}
Original file line number Diff line number Diff line change @@ -1126,6 +1126,7 @@ describe("ngAnimate", function() {
1126
1126
$rootScope . $digest ( ) ;
1127
1127
$timeout . flush ( ) ;
1128
1128
1129
+ expect ( elements [ 0 ] . attr ( 'style' ) ) . toMatch ( / t r a n s i t i o n - d u r a t i o n : 1 \d * s , \s * 3 \d * s ; / ) ;
1129
1130
expect ( elements [ 0 ] . attr ( 'style' ) ) . not . toContain ( 'transition-delay' ) ;
1130
1131
expect ( elements [ 1 ] . attr ( 'style' ) ) . toMatch ( / t r a n s i t i o n - d e l a y : 2 \. 1 \d * s , \s * 4 \. 1 \d * s / ) ;
1131
1132
expect ( elements [ 2 ] . attr ( 'style' ) ) . toMatch ( / t r a n s i t i o n - d e l a y : 2 \. 2 \d * s , \s * 4 \. 2 \d * s / ) ;
You can’t perform that action at this time.
0 commit comments