Merge pull request #222 from rjwright/AnimationTimingAlwaysAnObject

Animation timing should always be an object

Author: rjwright

src/animation-constructor.js

@@ -30,7 +30,7 @@
     this.target = target;
     // TODO: Make modifications to specified update the underlying player
     this._timing = shared.normalizeTimingInput(timingInput);
-    this.timing = timingInput;
+    this.timing = shared.makeTiming(timingInput);
     // TODO: Make this a live object - will need to separate normalization of
     // keyframes into a shared module.
     if (typeof effect == 'function')

src/group-constructors.js

@@ -16,8 +16,8 @@
 
   function constructor(children, timingInput) {
     this.children = children || [];
-    this.timing = timingInput;
     this._timing = shared.normalizeTimingInput(timingInput, true);
+    this.timing = shared.makeTiming(timingInput, true);
 
     if (this._timing.duration === 'auto')
       this._timing.duration = this.activeDuration;

src/timing-utilities.js

@@ -17,7 +17,7 @@
   var fills = 'backwards|forwards|both'.split('|');
   var directions = 'reverse|alternate|alternate-reverse'.split('|');
 
-  function normalizeTimingInput(timingInput, forGroup) {
+  function makeTiming(timingInput, forGroup) {
     var timing = {
       delay: 0,
       endDelay: 0,
@@ -29,7 +29,6 @@
       direction: 'normal',
       easing: 'linear',
     };
-
     if (typeof timingInput == 'number') {
       timing.duration = timingInput;
     } else if (timingInput !== undefined) {
@@ -48,6 +47,11 @@
         }
       });
     }
+    return timing;
+  }
+
+  function normalizeTimingInput(timingInput, forGroup) {
+    var timing = makeTiming(timingInput, forGroup);
     timing.easing = toTimingFunction(timing.easing);
     return timing;
   }
@@ -207,6 +211,7 @@
     return calculateTransformedTime(currentIteration, timing.duration, iterationTime, timing) / timing.duration;
   }
 
+  shared.makeTiming = makeTiming;
   shared.normalizeTimingInput = normalizeTimingInput;
   shared.calculateActiveDuration = calculateActiveDuration;
   shared.calculateTimeFraction = calculateTimeFraction;

test/js/animation-constructor.js

@@ -47,4 +47,20 @@ suite('animation-constructor', function() {
     assert.closeTo(leftAsNumber(target2), 15.25, 1);
   });
 
+  test('Timing is always converted to AnimationTimingInput', function() {
+    var target = document.createElement('div');
+    document.body.appendChild(target);
+
+    var keyframes = [{background: 'blue'}, {background: 'red'}];
+
+    var animation = new Animation(target, keyframes, 200);
+    assert.equal(animation.timing.duration, 200);
+
+    animation = new Animation(target, keyframes);
+    assert.isDefined(animation.timing);
+
+    animation = new Animation(target, keyframes, {duration: 200});
+    var group = new AnimationGroup([animation]);
+    assert.equal(group.timing.duration, 'auto');
+  });
 });