Skip to content

Commit 2211d4d

Browse files
liuwenchaoliuwenchao
committed
finish all functionality basically.
1 parent b89a8b8 commit 2211d4d

File tree

7 files changed

+506
-274
lines changed

7 files changed

+506
-274
lines changed

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.1",
44
"description": "Polymer Element for aha-table",
55
"authors": [
6-
"Louis"
6+
"Louis Liu"
77
],
88
"license": "MIT",
99
"main": "dist/aha-table.html",

‎bower_components/polymer/.bower.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"commit": "a0632dc45fc02a60f70881f49a9d18d9987ea243"
1515
},
1616
"_source": "git://github.com/Polymer/polymer.git",
17-
"_target": "0.2.3",
18-
"_originalSource": "Polymer/polymer",
19-
"_direct": true
17+
"_target": "~0.2.0",
18+
"_originalSource": "Polymer/polymer"
2019
}

‎index.html‎

Lines changed: 31 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,39 @@
1111
<script src="bower_components/platform/platform.js"></script>
1212

1313
<!-- Importing Custom Elements -->
14-
<link rel="import" href="src/aha-table-2.html">
15-
16-
<style>
17-
aha-table {
18-
display: table;
19-
border-collapse: separate;
20-
border-spacing: 2px;
21-
border-color: gray;
22-
}
23-
aha-tr {
24-
display: table-row;
25-
vertical-align: inherit;
26-
border-color: inherit;
27-
}
28-
aha-th, aha-td {
29-
display: table-cell;
30-
vertical-align: inherit;
31-
}
32-
</style>
14+
<link rel="import" href="src/aha-table.html">
3315
</head>
3416
<body unresolved>
17+
<aha-table id="example" perpage="2">
18+
</aha-table>
19+
20+
<script>
21+
var events = [
22+
{ title: 'gym', date: '2014-04-14', type: 'private', content: '5*20 situps, 5 miles running, 5 minutes planks' },
23+
{ title: 'breakfast', date: '2014-04-14', type: 'private' },
24+
{ title: 'work', date: '2014-04-14', type: 'public', content: 'implement aha-table plymer element' },
25+
{ title: 'lunch', date: '2014-04-14', type: 'public' },
26+
{ title: 'meeting', date: '2014-04-14', type: 'public', content: 'introduce web components to the team' },
27+
{ title: 'dinner', date: '2014-04-14', type: 'private' }
28+
];
29+
30+
var meta = [
31+
{name: "title", label: "Title", sortable: true, searchable: true, type: "text", editable: true, required: true},
32+
{name: "date", label: "Date", sortable: true, searchable: true, type: "date", editable: true, required: true},
33+
{name: "type", label: "Type", sortable: true, searchable: true, type: "select", editable: true, required: true, default: 'private', options: [
34+
{"value":"", "label": "Please select"},
35+
{"value":"private", "label":"Private Event"},
36+
{"value":"public", "label":"Public Event"}]
37+
},
38+
{name: "content", label: "Content", sortable: false, searchable: true, type: "textarea", editable: true, required: false}
39+
];
40+
41+
window.addEventListener('polymer-ready', function(){
42+
document.getElementById('example').data = events;
43+
document.getElementById('example').meta = meta;
44+
});
45+
</script>
46+
3547

3648
<!-- <aha-table id="example">
3749
<aha-tr>
@@ -75,41 +87,5 @@
7587
<aha-td column="content" type="textarea" editable default="1"></aha-td>
7688
</aha-tr>
7789
</aha-table> -->
78-
<aha-table id="example">
79-
</aha-table>
80-
81-
<script>
82-
var events = [
83-
{ title: 'gym', date: '2017/04/26', type: 'private', content: '5*20 situps, 5 miles running, 5 minutes planks' },
84-
{ title: 'breakfast', date: '2017/04/26', type: 'private' },
85-
{ title: 'work', date: '2017/04/26', type: 'public', content: 'implement aha-table plymer element' },
86-
{ title: 'lunch', date: '2017/04/26', type: 'public' },
87-
{ title: 'meeting', date: '2017/04/26', type: 'public', content: 'introduce web components to the team' },
88-
{ title: 'dinner', date: '2017/04/26', type: 'private' }
89-
];
90-
91-
var meta = {
92-
"columns": [
93-
{
94-
name: "title", label: "Title", sort: true, search: true, type: "text", editable: true, required: true
95-
},{
96-
name: "date", label: "Date", sort: true, search: true, type: "date", editable: true, required: true
97-
},{
98-
name: "type", label: "Type", sort: true, search: true, type: "select", editable: true, required: true, default: 'private', options: [
99-
{"value":"", "label": "Please select"},
100-
{"value":"private", "label":"Private Event"},
101-
{"value":"public", "label":"Public Event"}]
102-
},{
103-
name: "content", label: "Content", sort: false, search: true, type: "textarea", editable: true, required: false
104-
},
105-
]
106-
}
107-
108-
window.addEventListener('polymer-ready', function(){
109-
document.getElementById('example').data = events;
110-
document.getElementById('example').meta = meta;
111-
});
112-
</script>
113-
11490
</body>
11591
</html>

‎src/aha-table-2.html‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎src/aha-table.css‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)