Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 50bf029

Browse files
mgcreamatsko
authored andcommitted
fix(animate): remove trailing s
1 parent eff52ad commit 50bf029

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/ngAnimate/animate.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1141,7 +1141,7 @@ angular.module('ngAnimate', ['ng'])
11411141
var propertyStyle = timings.transitionPropertyStyle;
11421142
if(propertyStyle.indexOf('all') == -1) {
11431143
style += CSS_PREFIX + 'transition-property: ' + propertyStyle + ';';
1144-
style += CSS_PREFIX + 'transition-duration: ' + timings.transitionDurationStyle + 's;';
1144+
style += CSS_PREFIX + 'transition-duration: ' + timings.transitionDurationStyle + ';';
11451145
appliedStyles.push(CSS_PREFIX + 'transition-property');
11461146
appliedStyles.push(CSS_PREFIX + 'transition-duration');
11471147
}

test/ngAnimate/animateSpec.js

+1
Original file line numberDiff line numberDiff line change
@@ -1126,6 +1126,7 @@ describe("ngAnimate", function() {
11261126
$rootScope.$digest();
11271127
$timeout.flush();
11281128

1129+
expect(elements[0].attr('style')).toMatch(/transition-duration: 1\d*s,\s*3\d*s;/);
11291130
expect(elements[0].attr('style')).not.toContain('transition-delay');
11301131
expect(elements[1].attr('style')).toMatch(/transition-delay: 2\.1\d*s,\s*4\.1\d*s/);
11311132
expect(elements[2].attr('style')).toMatch(/transition-delay: 2\.2\d*s,\s*4\.2\d*s/);

0 commit comments

Comments
 (0)