merge from dev

This commit is contained in:
Luke Pulverenti 2016-01-30 13:52:33 -05:00
parent 8436c7ff3c
commit db793b9d25
46 changed files with 646 additions and 356 deletions

View file

@ -95,6 +95,11 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
return;
}
if(this.animationConfig.value && typeof this.animationConfig.value === 'function') {
this._warn(this._logf('playAnimation', "Please put 'animationConfig' inside of your components 'properties' object instead of outside of it."));
return;
}
// type is optional
var thisConfig;
if (type) {