diff options
author | Jo-Philipp Wich <jo@mein.io> | 2019-11-16 18:23:43 +0100 |
---|---|---|
committer | Jo-Philipp Wich <jo@mein.io> | 2019-11-16 18:25:52 +0100 |
commit | 13e9e3e9e8633c7a54fe5fec1481e9df62594982 (patch) | |
tree | 3e57a63b3645c289c1b495d7587cf7f020a2090d /modules/luci-base | |
parent | eaa193336fc7b1f4bf2b8a51c120308d90e86e95 (diff) |
treewide: fix "Unhandled token" errors with Lua CBI maps
The `data-type` attribute is used to bind datatype validators to a widget
while some templates used the same attribute to denote the name of the
underlying widget.
Change the `data-type` attributes referring to the widget name to
`data-widget` in order to stop the JS token error spam.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-base')
-rw-r--r-- | modules/luci-base/htdocs/luci-static/resources/form.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js index 7de5e0f76..1c6f84304 100644 --- a/modules/luci-base/htdocs/luci-static/resources/form.js +++ b/modules/luci-base/htdocs/luci-static/resources/form.js @@ -1103,7 +1103,7 @@ var CBITableSection = CBITypedSection.extend({ trEl.appendChild(E('div', { 'class': 'th cbi-section-table-cell', - 'data-type': opt.__name__ + 'data-widget': opt.__name__ })); if (opt.width != null) @@ -1139,7 +1139,7 @@ var CBITableSection = CBITypedSection.extend({ trEl.appendChild(E('div', { 'class': 'th cbi-section-table-cell', - 'data-type': opt.__name__ + 'data-widget': opt.__name__ }, opt.description)); if (opt.width != null) @@ -1444,7 +1444,7 @@ var CBIGridSection = CBITableSection.extend({ 'data-title': (title != '') ? title : null, 'data-description': (descr != '') ? descr : null, 'data-name': opt.option, - 'data-type': opt.typename || opt.__name__ + 'data-widget': opt.typename || opt.__name__ }, (value != null) ? value : E('em', _('none'))); }, @@ -1586,7 +1586,7 @@ var CBIValue = CBIAbstractValue.extend({ 'data-title': (title != '') ? title : null, 'data-description': this.stripTags(this.description).trim(), 'data-name': this.option, - 'data-type': this.typename || (this.template ? this.template.replace(/^.+\//, '') : null) || this.__name__ + 'data-widget': this.typename || (this.template ? this.template.replace(/^.+\//, '') : null) || this.__name__ }, E('div', { 'id': 'cbi-%s-%s-%s'.format(config_name, section_id, this.option), 'data-index': option_index, @@ -1602,7 +1602,7 @@ var CBIValue = CBIAbstractValue.extend({ 'data-depends': depend_list, 'data-field': this.cbid(section_id), 'data-name': this.option, - 'data-type': this.typename || (this.template ? this.template.replace(/^.+\//, '') : null) || this.__name__ + 'data-widget': this.typename || (this.template ? this.template.replace(/^.+\//, '') : null) || this.__name__ }); if (this.last_child) |