diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-09-24 08:01:04 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-09-24 08:01:04 +0200 |
| commit | 186ddfa0446c3a1023919bca7a33c6dc0d63f765 (patch) | |
| tree | 16caa2c7329f4f1386c985a79c907d05d032d89a /modules | |
| parent | 0068c3bd49eec03b70679f8d7787bcfe104492a9 (diff) | |
luci-base: form.js: do not inherit map tabbing to nested sections
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/luci-base/htdocs/luci-static/resources/form.js | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js index 372773474f..46f1ff4825 100644 --- a/modules/luci-base/htdocs/luci-static/resources/form.js +++ b/modules/luci-base/htdocs/luci-static/resources/form.js @@ -944,8 +944,8 @@ var CBITypedSection = CBIAbstractSection.extend({ sectionEl = E('div', { 'id': 'cbi-%s-%s'.format(config_name, this.sectiontype), 'class': 'cbi-section', - 'data-tab': this.map.tabbed ? this.sectiontype : null, - 'data-tab-title': this.map.tabbed ? this.title || this.sectiontype : null + 'data-tab': (this.map.tabbed && !this.parentoption) ? this.sectiontype : null, + 'data-tab-title': (this.map.tabbed && !this.parentoption) ? this.title || this.sectiontype : null }); if (this.title != null && this.title != '') @@ -1013,8 +1013,8 @@ var CBITableSection = CBITypedSection.extend({ sectionEl = E('div', { 'id': 'cbi-%s-%s'.format(config_name, this.sectiontype), 'class': 'cbi-section cbi-tblsection', - 'data-tab': this.map.tabbed ? this.sectiontype : null, - 'data-tab-title': this.map.tabbed ? this.title || this.sectiontype : null + 'data-tab': (this.map.tabbed && !this.parentoption) ? this.sectiontype : null, + 'data-tab-title': (this.map.tabbed && !this.parentoption) ? this.title || this.sectiontype : null }), tableEl = E('div', { 'class': 'table cbi-section-table' @@ -1503,8 +1503,8 @@ var CBINamedSection = CBIAbstractSection.extend({ sectionEl = E('div', { 'id': ucidata ? null : 'cbi-%s-%s'.format(config_name, section_id), 'class': 'cbi-section', - 'data-tab': this.map.tabbed ? this.sectiontype : null, - 'data-tab-title': this.map.tabbed ? this.title || this.sectiontype : null + 'data-tab': (this.map.tabbed && !this.parentoption) ? this.sectiontype : null, + 'data-tab-title': (this.map.tabbed && !this.parentoption) ? this.title || this.sectiontype : null }); if (typeof(this.title) === 'string' && this.title !== '') @@ -1922,6 +1922,7 @@ var CBISectionValue = CBIValue.extend({ throw 'Sub section must be a descendent of CBIAbstractSection'; this.subsection = cbiClass.instantiate(this.varargs(arguments, 4, this.map)); + this.subsection.parentoption = this; }, load: function(section_id) { |