From 625ea1e742fb97c266e9437920a3d753695c874f Mon Sep 17 00:00:00 2001 From: Chris Joel Date: Wed, 27 May 2015 21:49:21 -0700 Subject: [PATCH] 1.0.0 --- bower.json | 16 ++++++++-------- iron-icon.html | 13 +++++++++++++ test/iron-icon.html | 4 ++-- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/bower.json b/bower.json index 75c6909..e5ebedb 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "iron-icon", "private": true, - "version": "0.9.3", + "version": "1.0.0", "license": "http://polymer.github.io/LICENSE.txt", "description": "An element that supports displaying an icon", "main": "iron-icon.html", @@ -14,15 +14,15 @@ "icon" ], "dependencies": { - "iron-flex-layout": "polymerelements/iron-flex-layout#^0.9.0", - "iron-meta": "polymerelements/iron-meta#^0.9.0", - "polymer": "Polymer/polymer#^0.9.0" + "iron-flex-layout": "polymerelements/iron-flex-layout#^1.0.0", + "iron-meta": "polymerelements/iron-meta#^1.0.0", + "polymer": "Polymer/polymer#^1.0.0" }, "devDependencies": { - "test-fixture": "polymerelements/test-fixture#^0.9.0", - "iron-iconset": "polymerelements/iron-iconset#^0.9.0", - "iron-icons": "polymerelements/iron-icons#^0.9.0", - "iron-component-page": "polymerelements/iron-component-page#^0.9.0", + "test-fixture": "polymerelements/test-fixture#^1.0.0", + "iron-iconset": "polymerelements/iron-iconset#^1.0.0", + "iron-icons": "polymerelements/iron-icons#^1.0.0", + "iron-component-page": "polymerelements/iron-component-page#^1.0.0", "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" } diff --git a/iron-icon.html b/iron-icon.html index e63fec1..f214799 100644 --- a/iron-icon.html +++ b/iron-icon.html @@ -113,16 +113,29 @@ properties: { + /** + * The name of the icon to use. The name should be of the form: + * `iconset_name:icon_name`. + */ icon: { type: String, observer: '_iconChanged' }, + /** + * The name of the theme to used, if one is specified by the + * iconset. + */ theme: { type: String, observer: '_updateIcon' }, + /** + * If using iron-icon without an iconset, you can set the src to be + * the URL of an individual icon image file. Note that this will take + * precedence over a given icon attribute. + */ src: { type: String, observer: '_srcChanged' diff --git a/test/iron-icon.html b/test/iron-icon.html index aab0880..3b8202f 100644 --- a/test/iron-icon.html +++ b/test/iron-icon.html @@ -99,11 +99,11 @@ test('can change its icon dynamically', function() { var style = icon.style; - expect(style.backgroundPositionX).to.be.eql('0px'); + expect(style.backgroundPosition).to.match(/0(%|px) 0(%|px)/); icon.icon = "example:blank"; - expect(style.backgroundPositionX).to.be.eql('-24px'); + expect(style.backgroundPosition).to.match(/-24px 0(%|px)/); }); });