fix(Animation): Problem decimals using commas as decimal separation

Tests where failing due to `.` character being used as decimal separator in some regional settings (like spanish for example) Closes #6335 Closes #6338
angular · May 25, 2016 · 5f3d02b · 5f3d02b
1 parent 97e94dd
commit 5f3d02b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/modules/@angular/platform-browser/src/animate/animation.ts b/modules/@angular/platform-browser/src/animate/animation.ts
@@ -184,6 +184,7 @@ export class Animation {
       let value = NumberWrapper.parseInt(this.stripLetters(duration), 10);
       if (value > maxValue) maxValue = value;
     } else if (duration.substring(duration.length - 1) == 's') {
+      duration = StringWrapper.replace(duration, ',', '.');
       let ms = NumberWrapper.parseFloat(this.stripLetters(duration)) * 1000;
       let value = Math.floor(ms);
       if (value > maxValue) maxValue = value;

diff --git a/modules/@angular/platform-browser/test/animate/animation_builder_spec.ts b/modules/@angular/platform-browser/test/animate/animation_builder_spec.ts
@@ -93,6 +93,15 @@ export function main() {
          }
        }));
 
+    it('should support parsing when commas are used as decimal separator due to regional settings',
+       inject([AnimationBuilder], (animate) => {
+         var animateCss = animate.css();
+         var element = el(`<div></div>`);
+         var runner = animateCss.start(element);
+         expect(runner.parseDurationString('0,5s')).toBe(500);
+         expect(runner.parseDurationString('0.5s')).toBe(500);
+       }));
+
     it('should add classes', inject([AnimationBuilder], (animate) => {
          var animateCss = animate.css().addClass('one').addClass('two');
          var element = el('<div></div>');