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

update polymer

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-30 00:10:14 -04:00
parent 22a5e48860
commit 61d616c330
44 changed files with 447 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dashboard-ui/bower_components/iron-icon/iron-icon.html vendored
View file

@ -129,11 +129,14 @@ Custom property | Description | Default
type: String,
observer: '_srcChanged'
},
/**
* @type {!Polymer.IronMeta}
*/
_meta: {
value: Polymer.Base.create('iron-meta', {type: 'iconset'})
}
},
_DEFAULT_ICONSET: 'icons',
@ -157,12 +160,13 @@ Custom property | Description | Default
_updateIcon: function() {
if (this._usesIconset()) {
if (this._iconsetName) {
this._iconset = this._meta.byKey(this._iconsetName);
this._iconset = /** @type {?Polymer.Iconset} */ (
this._meta.byKey(this._iconsetName));
if (this._iconset) {
this._iconset.applyIcon(this, this._iconName, this.theme);
this.unlisten(window, 'iron-iconset-added', '_updateIcon');
} else {
this._warn(this._logf('_updateIcon', 'could not find iconset `'
+ this._iconsetName + '`, did you import the iconset?'));
this.listen(window, 'iron-iconset-added', '_updateIcon');
}
}
} else {