| 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 21 matching lines...) Expand all Loading... |
| 32 } | 32 } |
| 33 return String(value); | 33 return String(value); |
| 34 } | 34 } |
| 35 | 35 |
| 36 function merge(left, right) { | 36 function merge(left, right) { |
| 37 return [left, right, toCss]; | 37 return [left, right, toCss]; |
| 38 } | 38 } |
| 39 | 39 |
| 40 scope.addPropertiesHandler(parse, merge, ['font-weight']); | 40 scope.addPropertiesHandler(parse, merge, ['font-weight']); |
| 41 | 41 |
| 42 })(webAnimationsMinifill); | 42 })(webAnimations1); |
| OLD | NEW |