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

luci-base: form.js: improve ui tab interaction

Browse source 
- Delay initialization of tab groups
 - Tag section nodes with IDs to store per-section tab state

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-08-11 21:01:12 +02:00
parent c2eba00a10
commit b391387ce7
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/luci-base/htdocs/luci-static/resources/form.js
View file

@ -185,6 +185,11 @@ var CBIMap = CBINode.extend({
this.checkDepends(); this.checkDepends();
var tabGroups = mapEl.querySelectorAll('.cbi-section-node-tabbed');
for (var i = 0; i < tabGroups.length; i++)
ui.tabs.initTabGroup(tabGroups[i].childNodes);
return mapEl; return mapEl;
}, this)); }, this));
}, },
@ -748,11 +753,9 @@ var CBITypedSection = CBIAbstractSection.extend({
sectionEl.appendChild(E('div', { sectionEl.appendChild(E('div', {
'id': 'cbi-%s-%s'.format(config_name, cfgsections[i]), 'id': 'cbi-%s-%s'.format(config_name, cfgsections[i]),
'class': this.tabs 'class': this.tabs
? 'cbi-section-node cbi-section-node-tabbed' : 'cbi-section-node' ? 'cbi-section-node cbi-section-node-tabbed' : 'cbi-section-node',
'data-section-id': cfgsections[i]
}, nodes[i])); }, nodes[i]));
if (this.tabs)
ui.tabs.initTabGroup(sectionEl.lastChild.childNodes);
} }
if (nodes.length == 0) if (nodes.length == 0)
@ -819,7 +822,8 @@ var CBITableSection = CBITypedSection.extend({
'dragleave': this.sortable ? L.bind(this.handleDragLeave, this) : null, 'dragleave': this.sortable ? L.bind(this.handleDragLeave, this) : null,
'dragend': this.sortable ? L.bind(this.handleDragEnd, this) : null, 'dragend': this.sortable ? L.bind(this.handleDragEnd, this) : null,
'drop': this.sortable ? L.bind(this.handleDrop, this) : null, 'drop': this.sortable ? L.bind(this.handleDrop, this) : null,
'data-title': (sectionname && (!this.anonymous || this.sectiontitle)) ? sectionname : null 'data-title': (sectionname && (!this.anonymous || this.sectiontitle)) ? sectionname : null,
'data-section-id': cfgsections[i]
}); });
if (this.extedit || this.rowcolors) if (this.extedit || this.rowcolors)
@ -1312,11 +1316,9 @@ var CBINamedSection = CBIAbstractSection.extend({
sectionEl.appendChild(E('div', { sectionEl.appendChild(E('div', {
'id': 'cbi-%s-%s'.format(config_name, section_id), 'id': 'cbi-%s-%s'.format(config_name, section_id),
'class': this.tabs 'class': this.tabs
? 'cbi-section-node cbi-section-node-tabbed' : 'cbi-section-node' ? 'cbi-section-node cbi-section-node-tabbed' : 'cbi-section-node',
'data-section-id': section_id
}, nodes)); }, nodes));
if (this.tabs)
ui.tabs.initTabGroup(sectionEl.lastChild.childNodes);
} }
else if (this.addremove) { else if (this.addremove) {
sectionEl.appendChild( sectionEl.appendChild(