Merge pull request #261 from rjwright/GroupChildInit

Group child initialization

Author: rjwright

src/animation-constructor.js

@@ -98,7 +98,7 @@
 
   // TODO: Call into this less frequently.
   scope.Player.prototype._updateChildren = function() {
-    if (this.startTime === null || !this.source || !this._isGroup)
+    if (this.paused || !this.source || !this._isGroup)
       return;
     var offset = this.source._timing.delay;
     for (var i = 0; i < this.source.children.length; i++) {
@@ -107,14 +107,19 @@
 
       if (i >= this._childPlayers.length) {
         childPlayer = window.document.timeline.play(child);
-        child.player = this.source.player;
         this._childPlayers.push(childPlayer);
       } else {
         childPlayer = this._childPlayers[i];
       }
+      child.player = this.source.player;
 
       if (childPlayer.startTime != this.startTime + offset) {
-        childPlayer.startTime = this.startTime + offset;
+        if (this.startTime === null) {
+          childPlayer.currentTime = this.source.player.currentTime - offset;
+          childPlayer._startTime = null;
+        } else {
+          childPlayer.startTime = this.startTime + offset;
+        }
         childPlayer._updateChildren();
       }
 

src/group-constructors.js

@@ -75,6 +75,7 @@
     player._player._wrapper = player;
     player._isGroup = true;
     scope.awaitStartTime(player);
+    player._updateChildren();
   };
 
 

test/js/group-player.js

@@ -183,7 +183,7 @@ suite('group-player', function() {
   test('playing an animationGroup works as expected', function() {
     tick(90);
     var p = document.timeline.play(simpleAnimationGroup());
-    checkTimes(p, [null, 0], []);
+    checkTimes(p, [null, 0], [[null, 0], [null, 0], [null, 0]]);
     tick(100);
     checkTimes(p, [100, 0], [[100, 0], [100, 0], [100, 0]]);
     tick(300);
@@ -547,6 +547,35 @@ suite('group-player', function() {
     checkTimes(player, [101, 599], [[101, 500], [601, 99]], 't = 700');
   });
 
+  test('pausing before tick works as expected with a simple AnimationSequence', function() {
+    var player = document.timeline.play(this.seqSimple_source);
+    checkTimes(player, [null, 0], [[null, 0], [null, -500]], 't = 0');
+
+    player.pause();
+    checkTimes(player, [null, null], [[null, null], [null, null]], 't = 0');
+
+    tick(10);
+    checkTimes(player, [null, 0], [[null, 0], [null, -500]], 't = 10');
+  });
+
+  test('pausing and seeking before tick works as expected with a simple AnimationSequence', function() {
+    var player = document.timeline.play(this.seqSimple_source);
+    player.pause();
+
+    player.currentTime = 0;
+    checkTimes(player, [null, 0], [[null, 0], [null, -500]], 't = 10');
+
+    player.currentTime = 250;
+    checkTimes(player, [null, 250], [[null, 250], [null, -250]], 't = 10');
+
+    player.currentTime = 500;
+    checkTimes(player, [null, 500], [[null, 500], [null, 0]], 't = 10');
+
+    // FIXME: Expectation should be [null, 1000], [[null, 500], [null, 500]].
+    player.currentTime = 1000;
+    checkTimes(player, [null, 1000], [[null, 1000], [null, 500]], 't = 10');
+  });
+
   test('pausing works as expected with an AnimationSequence inside an AnimationSequence', function() {
     var player = document.timeline.play(this.seqWithSeq_source);
     tick(0);