From 21a0fcc4c19981501e5ab87362d80f7dcb7ceeb8 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 19 Dec 2011 18:55:59 +0000
Subject: libs/web: rework DynamicList widget to support dynamic lists composed
 of comboboxes

---
 libs/web/luasrc/view/cbi/dynlist.htm | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'libs/web/luasrc/view/cbi')

diff --git a/libs/web/luasrc/view/cbi/dynlist.htm b/libs/web/luasrc/view/cbi/dynlist.htm
index a9e77c7cce..fd626a4ecf 100644
--- a/libs/web/luasrc/view/cbi/dynlist.htm
+++ b/libs/web/luasrc/view/cbi/dynlist.htm
@@ -13,21 +13,14 @@
 <% end end %>
 </div>
 <script type="text/javascript">
-cbi_dynlist_init('<%=cbid%>', '<%=resource%>');
-<% if self.datatype then -%>
-	<% if #self.keylist > 0 then -%>
-		cbi_combobox_init('<%=cbid .. "." .. i%>', {
+cbi_dynlist_init(
+	'<%=cbid%>', '<%=resource%>', '<%=self.datatype%>',
+	<%=tostring(self.optional or self.rmempty)%>
+	<%- if #self.keylist > 0 then -%>, [{
 		<%- for i, k in ipairs(self.keylist) do -%>
 			<%-=string.format("%q", k) .. ":" .. string.format("%q", self.vallist[i])-%>
 			<%-if i<#self.keylist then-%>,<%-end-%>
 		<%-	end	-%>
-		}, '<%- if not self.rmempty and not self.optional then -%>
-			<%-: -- Please choose -- -%>
-		<%- end -%>', '<%: -- custom -- %>');
-	<% end -%>
-	<% for i=1, #vals + 1 do -%>
-	cbi_validate_field('<%=cbid%>.<%=i%>', <%=tostring((self.optional or self.rmempty) == true or i > #vals)%>, '<%=self.datatype%>');
-	<%- end %>
-<% end -%>
+	}, '<%: -- custom -- %>']<% end -%>);
 </script>
 <%+cbi/valuefooter%>
-- 
cgit v1.2.3