Skip to content

Commit

Permalink
1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Joel committed May 28, 2015
1 parent ecae0eb commit 625ea1e
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 10 deletions.
16 changes: 8 additions & 8 deletions bower.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
}
Expand Down
13 changes: 13 additions & 0 deletions iron-icon.html
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions test/iron-icon.html
Original file line number Diff line number Diff line change
Expand Up @@ -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)/);
});
});

Expand Down

0 comments on commit 625ea1e

Please sign in to comment.