Skip to content

Commit

Permalink
Merge pull request #4 from PolymerElements/update-for-0.9
Browse files Browse the repository at this point in the history
Update for 0.9-rc.1
  • Loading branch information
notwaldorf committed May 6, 2015
2 parents 3dc4aff + d1f9345 commit aac3aca
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 35 deletions.
9 changes: 5 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"name": "iron-component-page",
"version": "0.9.0",
"private": true,
"dependencies": {
"polymer": "polymer/polymer#^0.8.0-rc.7",
"iron-doc-viewer": "PolymerElements/iron-doc-viewer#^0.8.0",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^0.8.0"
"polymer": "polymer/polymer#^0.9.0-rc.1",
"iron-doc-viewer": "PolymerElements/iron-doc-viewer#^0.9.0",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^0.9.0"
},
"devDependencies": {
"test-fixture": "PolymerElements/test-fixture#^0.8.0",
"test-fixture": "PolymerElements/test-fixture#^0.9.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.6.0",
"web-component-tester": "*"
}
Expand Down
5 changes: 3 additions & 2 deletions demo/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!doctype html>
<!--
@license
Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE
The complete set of authors may be found at http://polymer.github.io/AUTHORS
Expand All @@ -19,8 +20,8 @@
</head>
<body>

<h2>icon-component-page</h2>
<!--<iron-component-page></iron-component-page>-->
<h2>iron-component-page</h2>
<iron-component-page></iron-component-page>

</body>
</html>
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!doctype html>
<!--
@license
Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE
The complete set of authors may be found at http://polymer.github.io/AUTHORS
Expand Down
57 changes: 28 additions & 29 deletions iron-component-page.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,45 +91,44 @@ <h1>{{moduleName}}</h1>

</template>

<script>

Polymer({

enableCustomStyleProperties: true,

properties: {

moduleName: {
observer: '_moduleNameChanged'
},
</dom-module>
<script>
Polymer({
is: 'iron-component-page',

_demoUrl: {
value: 'demo'
}
properties: {

moduleName: {
observer: '_moduleNameChanged'
},

ready: function() {
this.moduleName = this.moduleName || this._findModuleName();
},
_demoUrl: {
value: 'demo'
}

_findModuleName: function() {
var path = location.pathname.split('/');
var name = path.pop() || path.pop();
if (name.indexOf('.html') >= 0) {
name = path.pop();
}
return name || '';
},
},

ready: function() {
this.moduleName = this.moduleName || this._findModuleName();
},

_moduleNameChanged: function(moduleName) {
document.title = moduleName;
this._docUrl = moduleName + '.html';
_findModuleName: function() {
var path = location.pathname.split('/');
var name = path.pop() || path.pop();
if (name.indexOf('.html') >= 0) {
name = path.pop();
}
return name || '';
},

});
_moduleNameChanged: function(moduleName) {
document.title = moduleName;
this._docUrl = moduleName + '.html';
}

</script>
});

</dom-module>
</script>

0 comments on commit aac3aca

Please sign in to comment.