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>
(backported from commit 13e9e3e9e8)
This commit is contained in:
Jo-Philipp Wich 2019-11-16 18:23:43 +01:00
parent 9866be5204
commit 7a3f0dd6d4
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/luci-base/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-base/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)

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

@ -861,8 +861,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;
} }
@ -1599,8 +1599,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;
} }
@ -1717,12 +1717,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;
} }