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

luci-base: ui.js: tabs: fix empty pane checking, allow alternative query root

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-07-31 07:57:15 +02:00
parent 27e4146461
commit 89bcae20d0
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1589,8 +1589,14 @@ return L.Class.extend({
if (selected === null) { if (selected === null) {
selected = this.getActiveTabId(groupId); selected = this.getActiveTabId(groupId);
if (selected < 0 || selected >= panes.length) if (selected < 0 || selected >= panes.length || L.dom.isEmpty(panes[selected])) {
selected = 0; for (var i = 0; i < panes.length; i++) {
if (!L.dom.isEmpty(panes[i])) {
selected = i;
break;
}
}
}
menu.childNodes[selected].classList.add('cbi-tab'); menu.childNodes[selected].classList.add('cbi-tab');
menu.childNodes[selected].classList.remove('cbi-tab-disabled'); menu.childNodes[selected].classList.remove('cbi-tab-disabled');
@ -1630,13 +1636,13 @@ return L.Class.extend({
return true; return true;
}, },
updateTabs: function(ev) { updateTabs: function(ev, root) {
document.querySelectorAll('[data-tab-title]').forEach(function(pane) { (root || document).querySelectorAll('[data-tab-title]').forEach(function(pane) {
var menu = pane.parentNode.previousElementSibling, var menu = pane.parentNode.previousElementSibling,
tab = menu.querySelector('[data-tab="%s"]'.format(pane.getAttribute('data-tab'))), tab = menu.querySelector('[data-tab="%s"]'.format(pane.getAttribute('data-tab'))),
n_errors = pane.querySelectorAll('.cbi-input-invalid').length; n_errors = pane.querySelectorAll('.cbi-input-invalid').length;
if (!pane.firstElementChild) { if (L.dom.isEmpty(pane)) {
tab.style.display = 'none'; tab.style.display = 'none';
tab.classList.remove('flash'); tab.classList.remove('flash');
} }