Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1292)

Unified Diff: third_party/polymer/v1_0/components-chromium/iron-icon/iron-icon-extracted.js

Issue 1336623003: [MD settings] updating polymer to 1.1.13 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changed Polymer.IronCheckedElementBehavior name Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/polymer/v1_0/components-chromium/iron-icon/iron-icon-extracted.js
diff --git a/third_party/polymer/v1_0/components-chromium/iron-icon/iron-icon-extracted.js b/third_party/polymer/v1_0/components-chromium/iron-icon/iron-icon-extracted.js
index 76f0eaa8c75236430f0ebb4e24c1174d621acd57..7ff1c46ccb45d1af5da18d4db19d903c831772d9 100644
--- a/third_party/polymer/v1_0/components-chromium/iron-icon/iron-icon-extracted.js
+++ b/third_party/polymer/v1_0/components-chromium/iron-icon/iron-icon-extracted.js
@@ -30,7 +30,12 @@ Polymer({
src: {
type: String,
observer: '_srcChanged'
+ },
+
+ _meta: {
+ value: Polymer.Base.create('iron-meta', {type: 'iconset'})
}
+
},
_DEFAULT_ICONSET: 'icons',
@@ -50,10 +55,11 @@ Polymer({
return this.icon || !this.src;
},
+ /** @suppress {visibility} */
_updateIcon: function() {
if (this._usesIconset()) {
if (this._iconsetName) {
- this._iconset = this.$.meta.byKey(this._iconsetName);
+ this._iconset = this._meta.byKey(this._iconsetName);
if (this._iconset) {
this._iconset.applyIcon(this, this._iconName, this.theme);
} else {
@@ -66,6 +72,7 @@ Polymer({
this._img = document.createElement('img');
this._img.style.width = '100%';
this._img.style.height = '100%';
+ this._img.draggable = false;
}
this._img.src = this.src;
Polymer.dom(this.root).appendChild(this._img);

Powered by Google App Engine
This is Rietveld 408576698