| OLD | NEW |
| 1 // Copyright 2014 Google Inc. All rights reserved. | 1 // Copyright 2014 Google Inc. All rights reserved. |
| 2 // | 2 // |
| 3 // Licensed under the Apache License, Version 2.0 (the "License"); | 3 // Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 // you may not use this file except in compliance with the License. | 4 // you may not use this file except in compliance with the License. |
| 5 // You may obtain a copy of the License at | 5 // You may obtain a copy of the License at |
| 6 // | 6 // |
| 7 // http://www.apache.org/licenses/LICENSE-2.0 | 7 // http://www.apache.org/licenses/LICENSE-2.0 |
| 8 // | 8 // |
| 9 // Unless required by applicable law or agreed to in writing, software | 9 // Unless required by applicable law or agreed to in writing, software |
| 10 // distributed under the License is distributed on an "AS IS" BASIS, | 10 // distributed under the License is distributed on an "AS IS" BASIS, |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 }; | 68 }; |
| 69 | 69 |
| 70 underlyingPlayer = scope.timeline.play(new scope.Animation(null, ticker, gro
up._timing)); | 70 underlyingPlayer = scope.timeline.play(new scope.Animation(null, ticker, gro
up._timing)); |
| 71 return underlyingPlayer; | 71 return underlyingPlayer; |
| 72 }; | 72 }; |
| 73 | 73 |
| 74 scope.bindPlayerForGroup = function(player) { | 74 scope.bindPlayerForGroup = function(player) { |
| 75 player._player._wrapper = player; | 75 player._player._wrapper = player; |
| 76 player._isGroup = true; | 76 player._isGroup = true; |
| 77 scope.awaitStartTime(player); | 77 scope.awaitStartTime(player); |
| 78 player._updateChildren(); |
| 78 }; | 79 }; |
| 79 | 80 |
| 80 | 81 |
| 81 })(webAnimationsShared, webAnimationsMaxifill, webAnimationsTesting); | 82 })(webAnimationsShared, webAnimationsNext, webAnimationsTesting); |
| OLD | NEW |