aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Louvignes2014-01-02 12:26:43 +0100
committerMatias Niemelä2014-01-02 11:00:31 -0500
commit50bf029625d603fc652f0f413e709f43803743db (patch)
tree468cd6e77ad275bfb7fa605cb4b2b841cf8e8c68
parenteff52ad877c60d85cca5331f317d34eff7f9f43c (diff)
downloadangular.js-50bf029625d603fc652f0f413e709f43803743db.tar.bz2
fix(animate): remove trailing `s`
-rw-r--r--src/ngAnimate/animate.js2
-rw-r--r--test/ngAnimate/animateSpec.js1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ngAnimate/animate.js b/src/ngAnimate/animate.js
index 08c088e9..5f8dc673 100644
--- a/src/ngAnimate/animate.js
+++ b/src/ngAnimate/animate.js
@@ -1141,7 +1141,7 @@ angular.module('ngAnimate', ['ng'])
var propertyStyle = timings.transitionPropertyStyle;
if(propertyStyle.indexOf('all') == -1) {
style += CSS_PREFIX + 'transition-property: ' + propertyStyle + ';';
- style += CSS_PREFIX + 'transition-duration: ' + timings.transitionDurationStyle + 's;';
+ style += CSS_PREFIX + 'transition-duration: ' + timings.transitionDurationStyle + ';';
appliedStyles.push(CSS_PREFIX + 'transition-property');
appliedStyles.push(CSS_PREFIX + 'transition-duration');
}
diff --git a/test/ngAnimate/animateSpec.js b/test/ngAnimate/animateSpec.js
index fedea535..15bb0f5c 100644
--- a/test/ngAnimate/animateSpec.js
+++ b/test/ngAnimate/animateSpec.js
@@ -1126,6 +1126,7 @@ describe("ngAnimate", function() {
$rootScope.$digest();
$timeout.flush();
+ expect(elements[0].attr('style')).toMatch(/transition-duration: 1\d*s,\s*3\d*s;/);
expect(elements[0].attr('style')).not.toContain('transition-delay');
expect(elements[1].attr('style')).toMatch(/transition-delay: 2\.1\d*s,\s*4\.1\d*s/);
expect(elements[2].attr('style')).toMatch(/transition-delay: 2\.2\d*s,\s*4\.2\d*s/);