Skip to content

Commit 0bc7dad

Browse files
committed
bump to 2.0.11
1 parent 02a9ccb commit 0bc7dad

File tree

2 files changed

+63
-62
lines changed

2 files changed

+63
-62
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aha-table",
3-
"version": "2.0.10",
3+
"version": "2.0.11",
44
"description": "Polymer Element for aha-table, a searchable, sortable, editable, selectable, paginatable, copyable, removeable, movable table/grid.",
55
"authors": [
66
"Louis Liu"

dist/aha-table.html

Lines changed: 62 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -309,16 +309,16 @@
309309
checked$="{{getValue(row,column.name)}}" />
310310
</template>
311311
</div>
312-
<div
312+
<div
313313
on-click="click"
314314
class$="{{getReaderClass(row, column.name)}}">
315-
<template is="dom-if" if="{{!isEqual(column.type, 'html')}}">
316-
<span>{{readContent(row, column)}}</span>
317-
</template>
318-
<template is="dom-if" if="{{isEqual(column.type, 'html')}}">
319-
<aha-html-echo html="{{readContent(row, column)}}"></aha-html-echo>
320-
</template>
321-
</div>
315+
<template is="dom-if" if="{{!isEqual(column.type, 'html')}}">
316+
<span>{{readContent(row, column)}}</span>
317+
</template>
318+
<template is="dom-if" if="{{isEqual(column.type, 'html')}}">
319+
<aha-html-echo html="{{readContent(row, column)}}"></aha-html-echo>
320+
</template>
321+
</div>
322322
</td>
323323
</template>
324324
</tr>
@@ -655,13 +655,13 @@
655655
}
656656
return classList.join(' ');
657657
},
658-
readContent: function(row, column) {
658+
readContent: function(row, column) {
659659
var datum = row[column.name];
660-
if (column.renderer !== null && column.renderer !== undefined
661-
&& typeof column.renderer === 'string' && column.renderer.trim().length > 0) {
662-
datum = this._render(column.renderer, datum, row, column);
663-
}
664-
if (datum === null || datum === undefined
660+
if (column.renderer !== null && column.renderer !== undefined
661+
&& typeof column.renderer === 'string' && column.renderer.trim().length > 0) {
662+
datum = this._render(column.renderer, datum, row, column);
663+
}
664+
if (datum === null || datum === undefined
665665
|| typeof datum === 'string' && datum.trim().length === 0) {
666666
var options = column.options;
667667
var blank = column.placeholder;
@@ -901,6 +901,7 @@
901901
pagesizeChanged: function(newValue, oldValue){
902902
this.pagesize = parseInt(this.pagesize);
903903
this.refreshPagination();
904+
this.currentpageChanged();
904905
},
905906
// call this when total count is no changed.
906907
filterPage: function() {
@@ -1108,35 +1109,35 @@
11081109
e.target.classList.toggle('nosearch');
11091110
this.$$('#filter').classList.toggle('hide');
11101111
},
1111-
_render: function(name, datum, row, col) {
1112-
var args = [ datum, row, col, this ];
1113-
var displayValue = this._invokeRenderer(datum, name, args);
1114-
if (displayValue !== null) {
1115-
return displayValue;
1116-
}
1117-
displayValue = this._invokeRenderer(row, name, args);
1118-
if (displayValue !== null) {
1119-
return displayValue;
1120-
}
1121-
1122-
displayValue = this._invokeRenderer(this, name, args);
1123-
if (displayValue !== null) {
1124-
return displayValue;
1125-
}
1126-
1127-
displayValue = this._invokeRenderer(this.domHost, name, args);
1128-
if (displayValue === null || displayValue === undefined) {
1129-
displayValue = datum;
1130-
}
1131-
return displayValue;
1132-
},
1133-
_invokeRenderer: function (b, name, args) {
1134-
var fn = b[name];
1135-
if (fn) {
1136-
return fn.apply(this, args || Polymer.nar);
1137-
}
1138-
return null;
1139-
}
1112+
_render: function(name, datum, row, col) {
1113+
var args = [ datum, row, col, this ];
1114+
var displayValue = this._invokeRenderer(datum, name, args);
1115+
if (displayValue !== null) {
1116+
return displayValue;
1117+
}
1118+
displayValue = this._invokeRenderer(row, name, args);
1119+
if (displayValue !== null) {
1120+
return displayValue;
1121+
}
1122+
1123+
displayValue = this._invokeRenderer(this, name, args);
1124+
if (displayValue !== null) {
1125+
return displayValue;
1126+
}
1127+
1128+
displayValue = this._invokeRenderer(this.domHost, name, args);
1129+
if (displayValue === null || displayValue === undefined) {
1130+
displayValue = datum;
1131+
}
1132+
return displayValue;
1133+
},
1134+
_invokeRenderer: function (b, name, args) {
1135+
var fn = b[name];
1136+
if (fn) {
1137+
return fn.apply(this, args || Polymer.nar);
1138+
}
1139+
return null;
1140+
}
11401141

11411142
});
11421143
</script>
@@ -1223,10 +1224,10 @@
12231224
type: String,
12241225
value: ""
12251226
},
1226-
//renderer - function called to display value
1227-
renderer: {
1228-
type: String
1229-
}
1227+
//renderer - function called to display value
1228+
renderer: {
1229+
type: String
1230+
}
12301231
}
12311232
});
12321233
</script>
@@ -1254,18 +1255,18 @@
12541255
*/
12551256
-->
12561257
<script>
1257-
Polymer({
1258-
is: "aha-html-echo",
1259-
properties: {
1260-
//column name
1261-
html: {
1262-
type: String,
1263-
value: "",
1264-
observer: "onHtmlChanged"
1265-
}
1266-
},
1267-
onHtmlChanged: function() {
1268-
this.innerHTML = this.html;
1269-
}
1270-
});
1258+
Polymer({
1259+
is: "aha-html-echo",
1260+
properties: {
1261+
//column name
1262+
html: {
1263+
type: String,
1264+
value: "",
1265+
observer: "onHtmlChanged"
1266+
}
1267+
},
1268+
onHtmlChanged: function() {
1269+
this.innerHTML = this.html;
1270+
}
1271+
});
12711272
</script>

0 commit comments

Comments
 (0)