| Index: third_party/polymer/v1_0/components-chromium/neon-animation/animations/cascaded-animation-extracted.js
|
| diff --git a/third_party/polymer/v1_0/components-chromium/neon-animation/animations/cascaded-animation-extracted.js b/third_party/polymer/v1_0/components-chromium/neon-animation/animations/cascaded-animation-extracted.js
|
| index fa03fb948bf43a5da6561ee8389fb704c86841d9..2a1f4a8e9745058c732ab283efc053b40b5035e4 100644
|
| --- a/third_party/polymer/v1_0/components-chromium/neon-animation/animations/cascaded-animation-extracted.js
|
| +++ b/third_party/polymer/v1_0/components-chromium/neon-animation/animations/cascaded-animation-extracted.js
|
| @@ -6,18 +6,6 @@ Polymer({
|
| Polymer.NeonAnimationBehavior
|
| ],
|
|
|
| - properties: {
|
| -
|
| - /** @type {!Polymer.IronMeta} */
|
| - _animationMeta: {
|
| - type: Object,
|
| - value: function() {
|
| - return new Polymer.IronMeta({type: 'animation'});
|
| - }
|
| - }
|
| -
|
| - },
|
| -
|
| /**
|
| * @param {{
|
| * animation: string,
|
| @@ -27,13 +15,6 @@ Polymer({
|
| * }} config
|
| */
|
| configure: function(config) {
|
| - var animationConstructor = /** @type {Function} */ (
|
| - this._animationMeta.byKey(config.animation));
|
| - if (!animationConstructor) {
|
| - console.warn(this.is + ':', 'constructor for', config.animation, 'not found!');
|
| - return;
|
| - }
|
| -
|
| this._animations = [];
|
| var nodes = config.nodes;
|
| var effects = [];
|
| @@ -43,17 +24,29 @@ Polymer({
|
| config.timing.delay = config.timing.delay || 0;
|
|
|
| var oldDelay = config.timing.delay;
|
| + var abortedConfigure;
|
| for (var node, index = 0; node = nodes[index]; index++) {
|
| config.timing.delay += nodeDelay;
|
| config.node = node;
|
|
|
| - var animation = new animationConstructor();
|
| - var effect = animation.configure(config);
|
| + var animation = document.createElement(config.animation);
|
| + if (animation.isNeonAnimation) {
|
| + var effect = animation.configure(config);
|
|
|
| - this._animations.push(animation);
|
| - effects.push(effect);
|
| + this._animations.push(animation);
|
| + effects.push(effect);
|
| + } else {
|
| + Polymer.Base._warn(this.is + ':', config.animation, 'not found!');
|
| + abortedConfigure = true;
|
| + break;
|
| + }
|
| }
|
| config.timing.delay = oldDelay;
|
| + config.node = null;
|
| + // if a bad animation was configured, abort config.
|
| + if (abortedConfigure) {
|
| + return;
|
| + }
|
|
|
| this._effect = new GroupEffect(effects);
|
| return this._effect;
|
|
|