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

treewide: fix "Unhandled token" errors with Lua CBI maps

Browse source 
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>
This commit is contained in:
Jo-Philipp Wich 2019-11-16 18:23:43 +01:00
parent eaa193336f
commit 13e9e3e9e8
5 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1103,7 +1103,7 @@ var CBITableSection = CBITypedSection.extend({
trEl.appendChild(E('div', { trEl.appendChild(E('div', {
'class': 'th cbi-section-table-cell', 'class': 'th cbi-section-table-cell',
'data-type': opt.__name__ 'data-widget': opt.__name__
})); }));
if (opt.width != null) if (opt.width != null)
@ -1139,7 +1139,7 @@ var CBITableSection = CBITypedSection.extend({
trEl.appendChild(E('div', { trEl.appendChild(E('div', {
'class': 'th cbi-section-table-cell', 'class': 'th cbi-section-table-cell',
'data-type': opt.__name__ 'data-widget': opt.__name__
}, opt.description)); }, opt.description));
if (opt.width != null) if (opt.width != null)
@ -1444,7 +1444,7 @@ var CBIGridSection = CBITableSection.extend({
'data-title': (title != '') ? title : null, 'data-title': (title != '') ? title : null,
'data-description': (descr != '') ? descr : null, 'data-description': (descr != '') ? descr : null,
'data-name': opt.option, 'data-name': opt.option,
'data-type': opt.typename || opt.__name__ 'data-widget': opt.typename || opt.__name__
}, (value != null) ? value : E('em', _('none'))); }, (value != null) ? value : E('em', _('none')));
}, },
@ -1586,7 +1586,7 @@ var CBIValue = CBIAbstractValue.extend({
'data-title': (title != '') ? title : null, 'data-title': (title != '') ? title : null,
'data-description': this.stripTags(this.description).trim(), 'data-description': this.stripTags(this.description).trim(),
'data-name': this.option, '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', { }, E('div', {
'id': 'cbi-%s-%s-%s'.format(config_name, section_id, this.option), 'id': 'cbi-%s-%s-%s'.format(config_name, section_id, this.option),
'data-index': option_index, 'data-index': option_index,
@ -1602,7 +1602,7 @@ var CBIValue = CBIAbstractValue.extend({
'data-depends': depend_list, 'data-depends': depend_list,
'data-field': this.cbid(section_id), 'data-field': this.cbid(section_id),
'data-name': this.option, '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) if (this.last_child)

2
modules/luci-compat/luasrc/view/cbi/cell_valueheader.htm
View file

@ -5,7 +5,7 @@
-%> -%>
<div class="td cbi-value-field<% if self.error and self.error[section] then %> cbi-value-error<% end %><% if self.password then %> nowrap<% end %>"<%= <div class="td cbi-value-field<% if self.error and self.error[section] then %> cbi-value-error<% end %><% if self.password then %> nowrap<% end %>"<%=
attr("data-name", self.option) .. attr("data-name", self.option) ..
ifattr(ftype and #ftype > 0, "data-type", ftype) .. ifattr(ftype and #ftype > 0, "data-widget", ftype) ..
ifattr(title and #title > 0, "data-title", title, true) .. ifattr(title and #title > 0, "data-title", title, true) ..
ifattr(descr and #descr > 0, "data-description", descr, true) ifattr(descr and #descr > 0, "data-description", descr, true)
%>> %>>

4
modules/luci-compat/luasrc/view/cbi/tblsection.htm
View file

@ -52,7 +52,7 @@ function render_titles()
for i, k in ipairs(self.children) do for i, k in ipairs(self.children) do
if not k.optional then if not k.optional then
%><div class="th cbi-section-table-cell"<%= %><div class="th cbi-section-table-cell"<%=
width(k) .. attr('data-type', k.typename) %>><% width(k) .. attr('data-widget', k.typename) %>><%
if k.titleref then if k.titleref then
%><a title="<%=self.titledesc or translate('Go to relevant configuration page')%>" class="cbi-title-ref" href="<%=k.titleref%>"><% %><a title="<%=self.titledesc or translate('Go to relevant configuration page')%>" class="cbi-title-ref" href="<%=k.titleref%>"><%
@ -88,7 +88,7 @@ function render_descriptions()
for i, k in ipairs(self.children) do for i, k in ipairs(self.children) do
if not k.optional then if not k.optional then
%><div class="th cbi-section-table-cell"<%= %><div class="th cbi-section-table-cell"<%=
width(k) .. attr("data-type", k.typename) %>><% width(k) .. attr("data-widget", k.typename) %>><%
write(k.description) write(k.description)

18
themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css
View file

@ -71,8 +71,8 @@ header h3 a, header .brand {
word-wrap: normal; word-wrap: normal;
} }
.td[data-type="button"], .td[data-widget="button"],
.td[data-type="fvalue"] { .td[data-widget="fvalue"] {
flex: 1 1 17%; flex: 1 1 17%;
text-align: left; text-align: left;
} }
@ -145,12 +145,12 @@ header h3 a, header .brand {
flex-basis: 100%; flex-basis: 100%;
} }
.td.cbi-value-field[data-type="dvalue"] { .td.cbi-value-field[data-widget="dvalue"] {
flex-basis: 50%; flex-basis: 50%;
} }
.td.cbi-value-field[data-type="button"], .td.cbi-value-field[data-widget="button"],
.td.cbi-value-field[data-type="fvalue"] { .td.cbi-value-field[data-widget="fvalue"] {
flex-basis: 25%; flex-basis: 25%;
text-align: left; text-align: left;
} }
@ -311,7 +311,7 @@ header h3 a, header .brand {
flex-basis: 50% !important; 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; flex-basis: 33% !important;
} }
@ -320,9 +320,9 @@ header h3 a, header .brand {
flex-basis: 25% !important; flex-basis: 25% !important;
} }
[data-page="admin-system-fstab"] .td[data-type="button"]::before, [data-page="admin-system-fstab"] .td[data-widget="button"]::before,
[data-page="admin-system-startup"] .td[data-type="button"]::before, [data-page="admin-system-startup"] .td[data-widget="button"]::before,
[data-page="admin-status-processes"] .td[data-type="button"]::before { [data-page="admin-status-processes"] .td[data-widget="button"]::before {
display: none; display: none;
} }
} }

18
themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
View file

@ -933,8 +933,8 @@ div.cbi-optionals {
margin-left: 3px; margin-left: 3px;
} }
.th[data-type="button"], .td[data-type="button"], .th[data-widget="button"], .td[data-widget="button"],
.th[data-type="fvalue"], .td[data-type="fvalue"] { .th[data-widget="fvalue"], .td[data-widget="fvalue"] {
flex: 1 1 2em; flex: 1 1 2em;
text-align: center; text-align: center;
} }
@ -1828,8 +1828,8 @@ select + .cbi-button {
word-wrap: normal; word-wrap: normal;
} }
.td[data-type="button"], .td[data-widget="button"],
.td[data-type="fvalue"] { .td[data-widget="fvalue"] {
flex: 1 1 12.5%; flex: 1 1 12.5%;
text-align: left; text-align: left;
} }
@ -1972,12 +1972,12 @@ select + .cbi-button {
flex-basis: 100%; flex-basis: 100%;
} }
.td.cbi-value-field[data-type="dvalue"] { .td.cbi-value-field[data-widget="dvalue"] {
flex-basis: 50%; flex-basis: 50%;
} }
.td.cbi-value-field[data-type="button"], .td.cbi-value-field[data-widget="button"],
.td.cbi-value-field[data-type="fvalue"] { .td.cbi-value-field[data-widget="fvalue"] {
flex-basis: 25%; flex-basis: 25%;
text-align: left; text-align: left;
} }
@ -2038,8 +2038,8 @@ select + .cbi-button {
margin-top: .5em; margin-top: .5em;
} }
#cbi-firewall-rule .td[data-type="fvalue"], #cbi-firewall-rule .td[data-widget="fvalue"],
#cbi-firewall-redirect .td[data-type="fvalue"] { #cbi-firewall-redirect .td[data-widget="fvalue"] {
display: none; display: none;
} }
} }