From 7a3f0dd6d4509555bf65ba5e32e6168910a43cee Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
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 <jo@mein.io>
(backported from commit 13e9e3e9e8633c7a54fe5fec1481e9df62594982)
---
 .../luci-base/luasrc/view/cbi/cell_valueheader.htm |  2 +-
 modules/luci-base/luasrc/view/cbi/tblsection.htm   |  4 ++--
 .../htdocs/luci-static/openwrt.org/cascade.css     | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm b/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm
index 4b7095754..db5c66850 100644
--- a/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm
+++ b/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm
@@ -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 %>"<%=
 	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(descr and #descr > 0, "data-description", descr, true)
 %>>
diff --git a/modules/luci-base/luasrc/view/cbi/tblsection.htm b/modules/luci-base/luasrc/view/cbi/tblsection.htm
index 11c2206d8..1e067edf3 100644
--- a/modules/luci-base/luasrc/view/cbi/tblsection.htm
+++ b/modules/luci-base/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
 			%><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
 				%><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
 		if not k.optional then
 			%><div class="th cbi-section-table-cell"<%=
-				width(k) .. attr("data-type", k.typename) %>><%
+				width(k) .. attr("data-widget", k.typename) %>><%
 
 			write(k.description)
 
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 5becfc5ba..46d7b9d01 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
@@ -861,8 +861,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;
 }
@@ -1599,8 +1599,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;
 	}
@@ -1717,12 +1717,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;
 	}
-- 
2.25.1