| OLD | NEW |
| 1 Polymer.mixin2 = function(prototype, mixin) { | 1 Polymer.mixin2 = function(prototype, mixin) { |
| 2 | 2 |
| 3 // adds a single mixin to prototype | 3 // adds a single mixin to prototype |
| 4 | 4 |
| 5 if (mixin.mixinPublish) { | 5 if (mixin.mixinPublish) { |
| 6 prototype.publish = prototype.publish || {}; | 6 prototype.publish = prototype.publish || {}; |
| 7 Polymer.mixin(prototype.publish, mixin.mixinPublish); | 7 Polymer.mixin(prototype.publish, mixin.mixinPublish); |
| 8 } | 8 } |
| 9 | 9 |
| 10 if (mixin.mixinDelegates) { | 10 if (mixin.mixinDelegates) { |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 } | 26 } |
| 27 | 27 |
| 28 Polymer.mixin(prototype, mixin); | 28 Polymer.mixin(prototype, mixin); |
| 29 | 29 |
| 30 delete prototype.mixinPublish; | 30 delete prototype.mixinPublish; |
| 31 delete prototype.mixinDelegates; | 31 delete prototype.mixinDelegates; |
| 32 delete prototype.mixinObserve; | 32 delete prototype.mixinObserve; |
| 33 | 33 |
| 34 return prototype; | 34 return prototype; |
| 35 }; | 35 }; |
| OLD | NEW |