Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: ui.js: table enhancements

Browse source 
- Gracefully handle cells without innerText
 - Properly handle `DocumentFragment` call values on table update
 - Introduce ability to fetch actual cell value for sorting purposes from
   `data-value` attribute

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2022-11-22 10:08:44 +01:00
parent a5d21dadbd
commit 90a2b1eaeb
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/luci-base/htdocs/luci-static/resources/ui.js
View file

@ -3241,10 +3241,13 @@ var UITable = baseclass.extend(/** @lends LuCI.ui.table.prototype */ {
for (var i = 0; i < headings.length; i++) {
var text = (headings[i].innerText || '').trim();
var raw_val = Array.isArray(row[i]) ? row[i][0] : null;
var disp_val = Array.isArray(row[i]) ? row[i][1] : row[i];
var td = trows[n].appendChild(E('td', {
'class': 'td',
'data-title': (text !== '') ? text : null
}, (row[i] != null) ? row[i] : ''));
'data-title': (text !== '') ? text : null,
'data-value': raw_val
}, (disp_val != null) ? ((disp_val instanceof DocumentFragment) ? disp_val.cloneNode(true) : disp_val) : ''));
if (typeof(captionClasses) == 'object')
DOMTokenList.prototype.add.apply(td.classList, L.toArray(captionClasses[i]));
@ -3321,8 +3324,12 @@ var UITable = baseclass.extend(/** @lends LuCI.ui.table.prototype */ {
else if (typeof( opts.sortable) == 'object')
hint = opts.sortable[index];
if (dom.elem(value))
value = value.innerText.trim();
if (dom.elem(value)) {
if (value.hasAttribute('data-value'))
value = value.getAttribute('data-value');
else
value = (value.innerText || '').trim();
}
switch (hint || 'auto') {
case true: