From: Steven Barth <steven@midlink.org>
Date: Tue, 16 Sep 2008 10:08:20 +0000 (+0000)
Subject: Internet suXplorer JavaScript compatibility fixes
X-Git-Tag: 0.9.0~1279
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=0a0220ca29249d1a9a56262eff004e9cb7f05f33

Internet suXplorer JavaScript compatibility fixes
---

diff --git a/libs/cbi/luasrc/view/cbi/cell_valuefooter.htm b/libs/cbi/luasrc/view/cbi/cell_valuefooter.htm
index 6dd566714..e4f798294 100644
--- a/libs/cbi/luasrc/view/cbi/cell_valuefooter.htm
+++ b/libs/cbi/luasrc/view/cbi/cell_valuefooter.htm
@@ -21,7 +21,8 @@ $Id$
 		<%-
 			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
 		-%>
diff --git a/libs/cbi/luasrc/view/cbi/dynlist.htm b/libs/cbi/luasrc/view/cbi/dynlist.htm
index d2e60b1de..606831421 100644
--- a/libs/cbi/luasrc/view/cbi/dynlist.htm
+++ b/libs/cbi/luasrc/view/cbi/dynlist.htm
@@ -30,7 +30,8 @@ $Id$
 			<%-
 				for i, k in ipairs(self.keylist) do
 			-%>
-				<%-=string.format("%q", k) .. ":" .. string.format("%q", self.vallist[i])-%>,
+				<%-=string.format("%q", k) .. ":" .. string.format("%q", self.vallist[i])-%>
+				<%-if i<#self.keylist then-%>,<%-end-%>
 			<%-
 				end
 			-%>
diff --git a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
index e42043e78..d05714033 100644
--- a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
+++ b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
@@ -34,7 +34,8 @@ $Id$
 		<%-
 			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
 		-%>
diff --git a/libs/cbi/luasrc/view/cbi/ucisection.htm b/libs/cbi/luasrc/view/cbi/ucisection.htm
index e703053e1..5023f6a2f 100644
--- a/libs/cbi/luasrc/view/cbi/ucisection.htm
+++ b/libs/cbi/luasrc/view/cbi/ucisection.htm
@@ -31,7 +31,8 @@ $Id$
 				<%-
 					for i, val in pairs(self.optionals[section]) do
 				-%>
-					<%-=string.format("%q", val.option) .. ":" .. string.format("%q", striptags(val.title))-%>,
+					<%-=string.format("%q", val.option) .. ":" .. string.format("%q", striptags(val.title))-%>
+					<%-if next(self.optionals[section], i) then-%>,<%-end-%>
 				<%-
 					end
 				-%>
diff --git a/libs/cbi/luasrc/view/cbi/value.htm b/libs/cbi/luasrc/view/cbi/value.htm
index d85fa81d9..9ffefc423 100644
--- a/libs/cbi/luasrc/view/cbi/value.htm
+++ b/libs/cbi/luasrc/view/cbi/value.htm
@@ -20,7 +20,8 @@ $Id$
 		<%-
 			for i, k in ipairs(self.keylist) do
 		-%>
-			<%-=string.format("%q", k) .. ":" .. string.format("%q", self.vallist[i])-%>,
+			<%-=string.format("%q", k) .. ":" .. string.format("%q", self.vallist[i])-%>
+			<%-if i<#self.keylist then-%>,<%-end-%>
 		<%-
 			end
 		-%>