From 2390e7297601767ddc7f25ab5fb606500117ffea Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 16 Nov 2019 18:23:43 +0100 Subject: [PATCH] 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 (cherry picked from commit 13e9e3e9e8633c7a54fe5fec1481e9df62594982) --- .../htdocs/luci-static/resources/form.js | 10 +++++----- .../luasrc/view/cbi/cell_valueheader.htm | 2 +- .../luci-compat/luasrc/view/cbi/tblsection.htm | 4 ++-- .../htdocs/luci-static/bootstrap/mobile.css | 18 +++++++++--------- .../htdocs/luci-static/openwrt.org/cascade.css | 18 +++++++++--------- 5 files changed, 26 insertions(+), 26 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) diff --git a/modules/luci-compat/luasrc/view/cbi/cell_valueheader.htm b/modules/luci-compat/luasrc/view/cbi/cell_valueheader.htm index 4b7095754..db5c66850 100644 --- a/modules/luci-compat/luasrc/view/cbi/cell_valueheader.htm +++ b/modules/luci-compat/luasrc/view/cbi/cell_valueheader.htm @@ -5,7 +5,7 @@ -%>
0, "data-type", ftype) .. + ifattr(ftype and #ftype > 0, "data-widget", ftype) .. ifattr(title and #title > 0, "data-title", title, true) .. ifattr(descr and #descr > 0, "data-description", descr, true) %>> diff --git a/modules/luci-compat/luasrc/view/cbi/tblsection.htm b/modules/luci-compat/luasrc/view/cbi/tblsection.htm index 11c2206d8..1e067edf3 100644 --- a/modules/luci-compat/luasrc/view/cbi/tblsection.htm +++ b/modules/luci-compat/luasrc/view/cbi/tblsection.htm @@ -52,7 +52,7 @@ function render_titles() for i, k in ipairs(self.children) do if not k.optional then %>
><% + width(k) .. attr('data-widget', k.typename) %>><% if k.titleref then %><% @@ -88,7 +88,7 @@ function render_descriptions() for i, k in ipairs(self.children) do if not k.optional then %>
><% + width(k) .. attr("data-widget", k.typename) %>><% write(k.description) diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css index 2e0bf2f43..047bd8013 100644 --- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css +++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css @@ -71,8 +71,8 @@ header h3 a, header .brand { word-wrap: normal; } - .td[data-type="button"], - .td[data-type="fvalue"] { + .td[data-widget="button"], + .td[data-widget="fvalue"] { flex: 1 1 17%; text-align: left; } @@ -145,12 +145,12 @@ header h3 a, header .brand { flex-basis: 100%; } - .td.cbi-value-field[data-type="dvalue"] { + .td.cbi-value-field[data-widget="dvalue"] { flex-basis: 50%; } - .td.cbi-value-field[data-type="button"], - .td.cbi-value-field[data-type="fvalue"] { + .td.cbi-value-field[data-widget="button"], + .td.cbi-value-field[data-widget="fvalue"] { flex-basis: 25%; text-align: left; } @@ -311,7 +311,7 @@ header h3 a, header .brand { flex-basis: 50% !important; } - [data-page="admin-status-processes"] .td[data-type="button"] { + [data-page="admin-status-processes"] .td[data-widget="button"] { flex-basis: 33% !important; } @@ -320,9 +320,9 @@ header h3 a, header .brand { flex-basis: 25% !important; } - [data-page="admin-system-fstab"] .td[data-type="button"]::before, - [data-page="admin-system-startup"] .td[data-type="button"]::before, - [data-page="admin-status-processes"] .td[data-type="button"]::before { + [data-page="admin-system-fstab"] .td[data-widget="button"]::before, + [data-page="admin-system-startup"] .td[data-widget="button"]::before, + [data-page="admin-status-processes"] .td[data-widget="button"]::before { display: none; } } diff --git a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css index 4bdf055de..9708f0663 100644 --- a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css +++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css @@ -931,8 +931,8 @@ div.cbi-optionals { margin-left: 3px; } -.th[data-type="button"], .td[data-type="button"], -.th[data-type="fvalue"], .td[data-type="fvalue"] { +.th[data-widget="button"], .td[data-widget="button"], +.th[data-widget="fvalue"], .td[data-widget="fvalue"] { flex: 1 1 2em; text-align: center; } @@ -1819,8 +1819,8 @@ select + .cbi-button { word-wrap: normal; } - .td[data-type="button"], - .td[data-type="fvalue"] { + .td[data-widget="button"], + .td[data-widget="fvalue"] { flex: 1 1 12.5%; text-align: left; } @@ -1963,12 +1963,12 @@ select + .cbi-button { flex-basis: 100%; } - .td.cbi-value-field[data-type="dvalue"] { + .td.cbi-value-field[data-widget="dvalue"] { flex-basis: 50%; } - .td.cbi-value-field[data-type="button"], - .td.cbi-value-field[data-type="fvalue"] { + .td.cbi-value-field[data-widget="button"], + .td.cbi-value-field[data-widget="fvalue"] { flex-basis: 25%; text-align: left; } @@ -2029,8 +2029,8 @@ select + .cbi-button { margin-top: .5em; } - #cbi-firewall-rule .td[data-type="fvalue"], - #cbi-firewall-redirect .td[data-type="fvalue"] { + #cbi-firewall-rule .td[data-widget="fvalue"], + #cbi-firewall-redirect .td[data-widget="fvalue"] { display: none; } } -- 2.25.1