| 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 var r = right[i] || defaultShadow(left[i].inset); | 98 var r = right[i] || defaultShadow(left[i].inset); |
| 99 leftCopy.push(l); | 99 leftCopy.push(l); |
| 100 rightCopy.push(r); | 100 rightCopy.push(r); |
| 101 } | 101 } |
| 102 return scope.mergeNestedRepeated(nestedMerge, separator, leftCopy, rightCopy
); | 102 return scope.mergeNestedRepeated(nestedMerge, separator, leftCopy, rightCopy
); |
| 103 } | 103 } |
| 104 | 104 |
| 105 var mergeShadowList = mergeNestedRepeatedShadow.bind(null, mergeShadow, ', '); | 105 var mergeShadowList = mergeNestedRepeatedShadow.bind(null, mergeShadow, ', '); |
| 106 scope.addPropertiesHandler(parseShadowList, mergeShadowList, ['box-shadow', 't
ext-shadow']); | 106 scope.addPropertiesHandler(parseShadowList, mergeShadowList, ['box-shadow', 't
ext-shadow']); |
| 107 | 107 |
| 108 })(webAnimationsMinifill); | 108 })(webAnimations1); |
| OLD | NEW |