milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge from dev

Browse source
This commit is contained in:
Luke Pulverenti 2016-01-14 12:04:42 -05:00
parent d96250df7f
commit bcfee41a57
318 changed files with 54424 additions and 6419 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/bower_components/neon-animation/neon-animatable-behavior.html vendored
View file

@ -141,7 +141,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
* or a map of animation type to array of configuration objects.
*/
getAnimationConfig: function(type) {
var map = [];
var map = {};
var allConfigs = [];
this._getAnimationConfigRecursive(type, map, allConfigs);
// append the configurations saved in the map to the array