| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 nullAnimation._isCurrent = function() { | 52 nullAnimation._isCurrent = function() { |
| 53 return false; | 53 return false; |
| 54 }; | 54 }; |
| 55 nullAnimation._hasSameTarget = function() { | 55 nullAnimation._hasSameTarget = function() { |
| 56 return false; | 56 return false; |
| 57 }; | 57 }; |
| 58 return nullAnimation; | 58 return nullAnimation; |
| 59 }; | 59 }; |
| 60 | 60 |
| 61 if (WEB_ANIMATIONS_TESTING) { | 61 if (WEB_ANIMATIONS_TESTING) { |
| 62 testing.minifillAnimation = scope.Animation; | 62 testing.webAnimations1Animation = scope.Animation; |
| 63 } | 63 } |
| 64 | 64 |
| 65 })(webAnimationsShared, webAnimationsMinifill, webAnimationsTesting); | 65 })(webAnimationsShared, webAnimations1, webAnimationsTesting); |
| OLD | NEW |