|
309 | 309 | checked$="{{getValue(row,column.name)}}" /> |
310 | 310 | </template> |
311 | 311 | </div> |
312 | | - <div |
| 312 | + <div |
313 | 313 | on-click="click" |
314 | 314 | 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> |
322 | 322 | </td> |
323 | 323 | </template> |
324 | 324 | </tr> |
|
655 | 655 | } |
656 | 656 | return classList.join(' '); |
657 | 657 | }, |
658 | | - readContent: function(row, column) { |
| 658 | + readContent: function(row, column) { |
659 | 659 | 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 |
665 | 665 | || typeof datum === 'string' && datum.trim().length === 0) { |
666 | 666 | var options = column.options; |
667 | 667 | var blank = column.placeholder; |
|
901 | 901 | pagesizeChanged: function(newValue, oldValue){ |
902 | 902 | this.pagesize = parseInt(this.pagesize); |
903 | 903 | this.refreshPagination(); |
| 904 | + this.currentpageChanged(); |
904 | 905 | }, |
905 | 906 | // call this when total count is no changed. |
906 | 907 | filterPage: function() { |
|
1108 | 1109 | e.target.classList.toggle('nosearch'); |
1109 | 1110 | this.$$('#filter').classList.toggle('hide'); |
1110 | 1111 | }, |
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 | + } |
1140 | 1141 |
|
1141 | 1142 | }); |
1142 | 1143 | </script> |
|
1223 | 1224 | type: String, |
1224 | 1225 | value: "" |
1225 | 1226 | }, |
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 | + } |
1230 | 1231 | } |
1231 | 1232 | }); |
1232 | 1233 | </script> |
|
1254 | 1255 | */ |
1255 | 1256 | --> |
1256 | 1257 | <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 | + }); |
1271 | 1272 | </script> |
0 commit comments