X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fcbi%2Fluasrc%2Fview%2Fcbi%2Ffull_valuefooter.htm;h=0ae45fb32821f646f751ad7f25009ecb4050a22f;hb=6b104b9a458db6c2a1624085121814e7c8cbb014;hp=e42043e78ab3060ecdfcc83fe044932b39fa4029;hpb=898c45743aeda97da9e129d4d317d542eca3b4a4;p=project%2Fluci.git

diff --git a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
index e42043e78..0ae45fb32 100644
--- a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
+++ b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
@@ -13,7 +13,7 @@ $Id$
 
 -%>
 
-		<% if #self.description > 0 then -%>
+		<% if self.description and #self.description > 0 then -%>
 			<% if not luci.util.instanceof( self, luci.cbi.Flag ) then -%>
 				<br />
 			<%- end %>
@@ -28,17 +28,18 @@ $Id$
 </div>
 
 <% if #self.deps > 0 then -%>
-	<script type="text/javascript">
+	<script type="text/javascript" id="cbip-<%=self.config.."-"..section.."-"..self.option%>">
 		<% for j, d in ipairs(self.deps) do -%>
 			cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option..d.add%>", {
 		<%-
 			for k,v in pairs(d.deps) do
 		-%>
-			<%-=string.format('"cbid.%s.%s.%s"', self.config, section, k) .. ":" .. string.format("%q", v)-%>,
+			<%-=string.format('"cbid.%s.%s.%s"', self.config, section, k) .. ":" .. string.format("%q", v)-%>
+			<%-if next(d.deps, k) then-%>,<%-end-%>
 		<%-
 			end
 		-%>
-			});
+			}, "cbip-<%=self.config.."-"..section.."-"..self.option%>");
 		<%- end %>
 	</script>
 <%- end %>