| 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 return result[0]; | 107 return result[0]; |
| 108 } | 108 } |
| 109 } | 109 } |
| 110 | 110 |
| 111 scope.consumePosition = consumePosition; | 111 scope.consumePosition = consumePosition; |
| 112 scope.mergeOffsetList = mergeOffsetList; | 112 scope.mergeOffsetList = mergeOffsetList; |
| 113 | 113 |
| 114 var mergePositionList = scope.mergeNestedRepeated.bind(null, mergeOffsetList,
', '); | 114 var mergePositionList = scope.mergeNestedRepeated.bind(null, mergeOffsetList,
', '); |
| 115 scope.addPropertiesHandler(parsePositionList, mergePositionList, ['background-
position', 'object-position']); | 115 scope.addPropertiesHandler(parsePositionList, mergePositionList, ['background-
position', 'object-position']); |
| 116 | 116 |
| 117 })(webAnimationsMinifill); | 117 })(webAnimations1); |
| OLD | NEW |