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

luci-base: ui.js: ignore description when checking for empty tab panes

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-08-20 13:33:08 +02:00
parent 6b1003cd50
commit 3500562d5e
1 changed files with 10 additions and 6 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

@ -1628,7 +1628,7 @@ return L.Class.extend({
active = pane.getAttribute('data-tab-active') === 'true'; active = pane.getAttribute('data-tab-active') === 'true';
menu.appendChild(E('li', { menu.appendChild(E('li', {
'style': L.dom.isEmpty(pane) ? 'display:none' : null, 'style': this.isEmptyPane(pane) ? 'display:none' : null,
'class': active ? 'cbi-tab' : 'cbi-tab-disabled', 'class': active ? 'cbi-tab' : 'cbi-tab-disabled',
'data-tab': name 'data-tab': name
}, E('a', { }, E('a', {
@ -1645,9 +1645,9 @@ return L.Class.extend({
if (selected === null) { if (selected === null) {
selected = this.getActiveTabId(panes[0]); selected = this.getActiveTabId(panes[0]);
if (selected < 0 || selected >= panes.length || L.dom.isEmpty(panes[selected])) { if (selected < 0 || selected >= panes.length || this.isEmptyPane(panes[selected])) {
for (var i = 0; i < panes.length; i++) { for (var i = 0; i < panes.length; i++) {
if (!L.dom.isEmpty(panes[i])) { if (!this.isEmptyPane(panes[i])) {
selected = i; selected = i;
break; break;
} }
@ -1662,6 +1662,10 @@ return L.Class.extend({
} }
}, },
isEmptyPane: function(pane) {
return L.dom.isEmpty(pane, function(n) { return n.classList.contains('cbi-tab-descr') });
},
getPathForPane: function(pane) { getPathForPane: function(pane) {
var path = [], node = null; var path = [], node = null;
@ -1712,7 +1716,7 @@ return L.Class.extend({
}, },
updateTabs: function(ev, root) { updateTabs: function(ev, root) {
(root || document).querySelectorAll('[data-tab-title]').forEach(function(pane) { (root || document).querySelectorAll('[data-tab-title]').forEach(L.bind(function(pane) {
var menu = pane.parentNode.previousElementSibling, var menu = pane.parentNode.previousElementSibling,
tab = menu ? menu.querySelector('[data-tab="%s"]'.format(pane.getAttribute('data-tab'))) : null, tab = menu ? menu.querySelector('[data-tab="%s"]'.format(pane.getAttribute('data-tab'))) : null,
n_errors = pane.querySelectorAll('.cbi-input-invalid').length; n_errors = pane.querySelectorAll('.cbi-input-invalid').length;
@ -1720,7 +1724,7 @@ return L.Class.extend({
if (!menu || !tab) if (!menu || !tab)
return; return;
if (L.dom.isEmpty(pane)) { if (this.isEmptyPane(pane)) {
tab.style.display = 'none'; tab.style.display = 'none';
tab.classList.remove('flash'); tab.classList.remove('flash');
} }
@ -1738,7 +1742,7 @@ return L.Class.extend({
tab.removeAttribute('data-errors'); tab.removeAttribute('data-errors');
tab.removeAttribute('data-tooltip'); tab.removeAttribute('data-tooltip');
} }
}); }, this));
}, },
switchTab: function(ev) { switchTab: function(ev) {