Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update to use the new g-component sugar #40

Merged
merged 1 commit into from
Nov 20, 2012
Merged

update to use the new g-component sugar #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions src/css/g-ratings.css
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions src/css/g-tabs.css
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion src/g-icon.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
width: 21px;
height: 21px;
cursor: pointer;
background: no-repeat center contain;
background: no-repeat center;
background-size: contain;
}
</style>
<div class="icon" style="background-image:url({{src}})"></div>
Expand Down
53 changes: 32 additions & 21 deletions src/g-ratings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,46 @@
* license that can be found in the LICENSE file.
*/
-->
<element name="g-ratings" attributes="value" handlers="click: clickHandler">
<element name="g-ratings" attributes="count, value">
<link rel="components" href="g-component.html">
<link rel="stylesheet" href="css/g-ratings.css" />
<template>
<span class="star"></span>
<span class="star"></span>
<span class="star"></span>
<span class="star"></span>
<span class="star"></span>
<style>
.star {
display: inline-block;
width: 12px;
height: 21px;
background: url('images/star_blank.svg') center no-repeat;
cursor: default;
}

.star.full {
background: url('images/star_full.svg') center no-repeat;
}
</style>
<template iterate="stars">
<span index="{{index}}" class="star {{starClass}}" on-click="starClick"></span>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better to leave the click handler on the element rather than the iterated nodes.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We decided not to change this right now. Declarative events currently listen on the node and therefore do not get targets from the node's shadowDom.

</template>
</template>
<script>
this.component({
shadowRootCreated: function(inRoot) {
this.stars = ShadowDOM.localQueryAll(inRoot, ".star");
ready: function() {
this.node.count = this.node.count || 5;
},
created: function() {
countChanged: function() {
this.stars = [];
for (var i = 0; i < this.node.count; i++) {
this.stars.push({index: i});
}
this.valueChanged();
},
prototype: {
valueChanged: function() {
for (var i=0, s; s=this.stars[i]; i++) {
s.classList.toggle('full', i < Number(this.value));
}
},
clickHandler: function(e) {
var s = e.target;
var i = this.stars.indexOf(s);
this.value = i + (s.classList.contains('full') ? 0 : 1);
}
valueChanged: function() {
this.stars && this.stars.forEach(function(s, i) {
s.starClass = i < this.value ? 'full' : '';
}.bind(this));
},
starClick: function(e) {
var s = e.currentTarget.model;
this.node.value = s.index + (s.starClass == 'full' ? 0 : 1);
}
});
</script>
Expand Down
54 changes: 46 additions & 8 deletions src/g-tabs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,56 @@
-->
<element name="g-tabs" extends="g-selector" attributes="selected, multi, vertical" handlers="click: clickHandler">
<link rel="components" href="g-selector.html">
<link rel="stylesheet" href="css/g-tabs.css" />
<template>
<div class="tabContainer">
<shadow></shadow>
</div>
<style>
@host {
display: block;
height: 28px;
line-height: 28px;
border: 0;
border-bottom: 1px solid #ccc;
}

@host.vertical {
display: inline-block;
width: 71px;
height: 100%;
border: 0;
border-right: 1px solid #ccc;
}

@host > * {
display: inline-block;
min-width: 54px;
height: 27px;
line-height: 27px;
text-align: center;
padding: 0 8px;
cursor: default;
border: 1px solid transparent;
border-radius: 2px 2px 0 0;
-webkit-transition: all 0.218s;
}

@host.vertical > * {
border-radius: 2px 0 0 2px;
}

@host > :hover {
color: #555;
}

@host > .selected {
color: #202020;
border: 1px solid #ccc;
}
</style>
<shadow></shadow>
</template>
<script>
this.component({
prototype: {
verticalChanged: function() {
this.classList.toggle('vertical', this.vertical);
}
verticalChanged: function() {
this.node.classList.toggle('vertical', this.vertical);
}
});
</script>
Expand Down
11 changes: 5 additions & 6 deletions src/g-togglebutton.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@
</template>
<script>
this.component({
prototype: {
valueChanged: function() {
this.$.toggle.classList.toggle('on', this.value);
},
valueChanged: function() {
this.$.toggle.classList.toggle('on', this.value);
},
publish: {
toggle: function() {
this.value = !this.value;
this.node.value = !this.node.value;
}
// TODO(ffu): need to add dragging support
}
});
</script>
Expand Down
4 changes: 3 additions & 1 deletion workbench/ratings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
<html>
<head>
<title>Ratings</title>
<script src="../../polyfills/Components/components-polyfill.js" shadow="shim"></script>
<script src="../../polyfills/Components/components-polyfill.js"></script>
<link rel="components" href="../../toolkit/src/g-ratings.html">
</head>
<body>
<g-ratings value="3"></g-ratings>
<br>
<g-ratings value="5" count="10"></g-ratings>
</body>
</html>
2 changes: 1 addition & 1 deletion workbench/tabs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<title>Tabs</title>
<script src="../../polyfills/Components/components-polyfill.js" shadow="shim"></script>
<script src="../../polyfills/Components/components-polyfill.js"></script>
<link rel="components" href="../../toolkit/src/g-tabs.html">
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion workbench/togglebutton.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<html>
<head>
<title>Toggle Button</title>
<script src="../../polyfills/Components/components-polyfill.js" shadow="shim"></script>
<script src="../../polyfills/Components/components-polyfill.js"></script>
<link rel="components" href="../../toolkit/src/g-togglebutton.html">
</head>
<body>
Expand Down