Skip to content

Commit eef8f96

Browse files
committed
Merge branch 'feature/issue-16' into develop
2 parents f57e78e + 1e91555 commit eef8f96

37 files changed

+1600
-1644
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Or [download as ZIP](https://github.com/handsontable/hot-table/archive/gh-pages.
2323
1. Import Web Components' polyfill:
2424

2525
```html
26-
<script src="bower_components/webcomponentsjs/webcomponents.js"></script>
26+
<script src="bower_components/webcomponentsjs/webcomponents-lite.js"></script>
2727
```
2828

2929
2. Import Custom Element:

bower.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.1.8",
44
"description": "Polymer Element wrapper for Handsontable data grid editor",
55
"license": "MIT",
6-
"main": "src/hot-table.html",
6+
"main": "hot-table.html",
77
"keywords": [
88
"polymer",
99
"web-components",
@@ -21,10 +21,10 @@
2121
"tests"
2222
],
2323
"dependencies": {
24-
"polymer": "Polymer/polymer#~0.5.6",
25-
"handsontable": "~0.15.0-beta6"
24+
"polymer": "Polymer/polymer#^1.0.0",
25+
"handsontable": "~0.16.1"
2626
},
2727
"devDependencies": {
28-
"google-map": "GoogleWebComponents/google-map#~0.4.1"
28+
"google-map": "GoogleWebComponents/google-map#^1.0.0"
2929
}
3030
}

examples/components/age-renderer.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11

22
<template id="template">
33
<style>
4-
:host {
5-
white-space: normal;
6-
}
74
#message {
85
color: green;
96
}

examples/components/age-renderer.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
(function() {
22

3+
if (!Handsontable.helper.isWebComponentSupportedNatively()) {
4+
return;
5+
}
6+
37
var
48
owner = (document._currentScript || document.currentScript).ownerDocument;
59

@@ -15,7 +19,7 @@
1519
});
1620

1721
/**
18-
* On create custom element
22+
* On create custom element.
1923
*/
2024
AgeRenderer.prototype.createdCallback = function() {
2125
this.shadow = this.createShadowRoot();
@@ -24,7 +28,14 @@
2428
};
2529

2630
/**
27-
* Render element
31+
* On attached to the DOM custom element.
32+
*/
33+
AgeRenderer.prototype.attachedCallback = function() {
34+
this.updateAge(this.age);
35+
};
36+
37+
/**
38+
* Render element.
2839
*/
2940
AgeRenderer.prototype.updateAge = function(age) {
3041
var desc = this.holder.querySelector('#message');

examples/components/bold-renderer.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<!-- Import Polymer -->
33
<link rel="import" href="../../../polymer/polymer.html">
44

5-
<polymer-element name="bold-renderer" constructor="BoldRenderer">
5+
<dom-module id="bold-renderer">
6+
<style>
7+
:host {
8+
white-space: normal;
9+
}
10+
.bold-value {
11+
font-weight: bold;
12+
}
13+
</style>
614
<template>
7-
<style>
8-
:host {
9-
white-space: normal;
10-
}
11-
span {
12-
font-weight: bold;
13-
}
14-
</style>
1515
<span class="bold-value">{{ value }}</span>
1616
</template>
1717
<script src="bold-renderer.js"></script>
18-
</polymer-element>
18+
</dom-module>

examples/components/bold-renderer.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
(function () {
22

3-
Polymer('bold-renderer', {
4-
attributeChanged: function(attrName, oldVal, newVal) {
5-
if (attrName === 'value') {
6-
this.value = newVal;
3+
Polymer({
4+
is: 'bold-renderer',
5+
6+
properties: {
7+
value: {
8+
type: String
79
}
810
}
911
});

examples/components/colored-renderer.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<!-- Import Polymer -->
33
<link rel="import" href="../../../polymer/polymer.html">
44

5-
<polymer-element name="colored-renderer" constructor="ColoredRenderer">
5+
<dom-module id="colored-renderer">
6+
<style>
7+
:host {
8+
white-space: normal;
9+
}
10+
</style>
611
<template>
7-
<style>
8-
:host {
9-
white-space: normal;
10-
}
11-
</style>
12-
<template repeat="{{ v, i in splitedValue }}"><span style="color: {{ i % 2 ? 'red' : 'green' }}">{{ v }}</span></template>
12+
<template is="dom-repeat" items="{{ splitedValue }}" as="v" index-as="i"><span style$="{{computeStyle(i)}}">{{ v }}</span></template>
1313
</template>
1414
<script src="colored-renderer.js"></script>
15-
</polymer-element>
15+
</dom-module>

examples/components/colored-renderer.js

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
11
(function () {
22

3-
Polymer('colored-renderer', {
4-
attributeChanged: function(attrName, oldVal, newVal) {
5-
if (attrName === 'value') {
6-
this.splitValue(newVal);
3+
Polymer({
4+
is: 'colored-renderer',
5+
6+
properties: {
7+
value: {
8+
type: String,
9+
observer: '_onChanged'
710
}
811
},
912

1013
/**
1114
* Split string into array
1215
*/
13-
splitValue: function(value) {
14-
if (value) {
15-
this.splitedValue = value.split('');
16-
}
16+
splitValue: function (value) {
17+
this.splitedValue = typeof value === 'string' ? value.split('') : [];
18+
},
19+
20+
computeStyle: function(i) {
21+
return 'color: ' + (i % 2 ? 'red' : 'green');
22+
},
23+
24+
_onChanged: function(value) {
25+
this.splitValue(value);
1726
}
1827
});
1928

0 commit comments

Comments
 (0)