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, |
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
12 // See the License for the specific language governing permissions and | 12 // See the License for the specific language governing permissions and |
13 // limitations under the License. | 13 // limitations under the License. |
14 | 14 |
15 (function(scope, testing) { | 15 (function(scope, testing) { |
16 | 16 |
17 function merge(left, right) { | 17 function merge(left, right) { |
18 if (left != 'visible' && right != 'visible') return; | 18 if (left != 'visible' && right != 'visible') return; |
19 return [0, 1, function(x) { | 19 return [0, 1, function(x) { |
20 if (x <= 0) return left; | 20 if (x <= 0) return left; |
21 if (x >= 1) return right; | 21 if (x >= 1) return right; |
22 return 'visible'; | 22 return 'visible'; |
23 }]; | 23 }]; |
24 } | 24 } |
25 | 25 |
26 scope.addPropertiesHandler(String, merge, ['visibility']); | 26 scope.addPropertiesHandler(String, merge, ['visibility']); |
27 | 27 |
28 })(webAnimationsMinifill); | 28 })(webAnimations1); |
29 | 29 |
OLD | NEW |