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

luci-base: form.js: do not inherit map tabbing to nested sections

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-09-24 08:01:04 +02:00
parent 0068c3bd49
commit 186ddfa044
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -944,8 +944,8 @@ var CBITypedSection = CBIAbstractSection.extend({
sectionEl = E('div', { sectionEl = E('div', {
'id': 'cbi-%s-%s'.format(config_name, this.sectiontype), 'id': 'cbi-%s-%s'.format(config_name, this.sectiontype),
'class': 'cbi-section', 'class': 'cbi-section',
'data-tab': this.map.tabbed ? this.sectiontype : null, 'data-tab': (this.map.tabbed && !this.parentoption) ? this.sectiontype : null,
'data-tab-title': this.map.tabbed ? this.title || this.sectiontype : null 'data-tab-title': (this.map.tabbed && !this.parentoption) ? this.title || this.sectiontype : null
}); });
if (this.title != null && this.title != '') if (this.title != null && this.title != '')
@ -1013,8 +1013,8 @@ var CBITableSection = CBITypedSection.extend({
sectionEl = E('div', { sectionEl = E('div', {
'id': 'cbi-%s-%s'.format(config_name, this.sectiontype), 'id': 'cbi-%s-%s'.format(config_name, this.sectiontype),
'class': 'cbi-section cbi-tblsection', 'class': 'cbi-section cbi-tblsection',
'data-tab': this.map.tabbed ? this.sectiontype : null, 'data-tab': (this.map.tabbed && !this.parentoption) ? this.sectiontype : null,
'data-tab-title': this.map.tabbed ? this.title || this.sectiontype : null 'data-tab-title': (this.map.tabbed && !this.parentoption) ? this.title || this.sectiontype : null
}), }),
tableEl = E('div', { tableEl = E('div', {
'class': 'table cbi-section-table' 'class': 'table cbi-section-table'
@ -1503,8 +1503,8 @@ var CBINamedSection = CBIAbstractSection.extend({
sectionEl = E('div', { sectionEl = E('div', {
'id': ucidata ? null : 'cbi-%s-%s'.format(config_name, section_id), 'id': ucidata ? null : 'cbi-%s-%s'.format(config_name, section_id),
'class': 'cbi-section', 'class': 'cbi-section',
'data-tab': this.map.tabbed ? this.sectiontype : null, 'data-tab': (this.map.tabbed && !this.parentoption) ? this.sectiontype : null,
'data-tab-title': this.map.tabbed ? this.title || this.sectiontype : null 'data-tab-title': (this.map.tabbed && !this.parentoption) ? this.title || this.sectiontype : null
}); });
if (typeof(this.title) === 'string' && this.title !== '') if (typeof(this.title) === 'string' && this.title !== '')
@ -1922,6 +1922,7 @@ var CBISectionValue = CBIValue.extend({
throw 'Sub section must be a descendent of CBIAbstractSection'; throw 'Sub section must be a descendent of CBIAbstractSection';
this.subsection = cbiClass.instantiate(this.varargs(arguments, 4, this.map)); this.subsection = cbiClass.instantiate(this.varargs(arguments, 4, this.map));
this.subsection.parentoption = this;
}, },
load: function(section_id) { load: function(section_id) {