libs/web: add float and ufloat datatypes for field validation

2 files changed, 17 insertions, 2 deletions

diff --git a/libs/web/htdocs/luci-static/resources/cbi.js b/libs/web/htdocs/luci-static/resources/cbi.js
index 3959b6937..992b5588e 100644
--- a/libs/web/htdocs/luci-static/resources/cbi.js
+++ b/libs/web/htdocs/luci-static/resources/cbi.js
@@ -27,6 +27,16 @@ var cbi_validators = {
 		return (cbi_validators.integer(v) && (v >= 0));
 	},
 
+	'float': function(v)
+	{
+		return !isNaN(parseFloat(v));
+	},
+
+	'ufloat': function(v)
+	{
+		return (cbi_validators['float'](v) && (v >= 0));
+	},
+
 	'ipaddr': function(v)
 	{
 		return cbi_validators.ip4addr(v) || cbi_validators.ip6addr(v);
diff --git a/libs/web/luasrc/cbi/datatypes.lua b/libs/web/luasrc/cbi/datatypes.lua
index 2fdb5802c..62f06c4b4 100644
--- a/libs/web/luasrc/cbi/datatypes.lua
+++ b/libs/web/luasrc/cbi/datatypes.lua
@@ -35,7 +35,7 @@ function bool(val)
 	return false
 end
 
-function uint(val)
+function uinteger(val)
 	local n = tonumber(val)
 	if n ~= nil and math.floor(n) == n and n >= 0 then
 		return true
@@ -44,7 +44,7 @@ function uint(val)
 	return false
 end
 
-function int(val)
+function integer(val)
 	local n = tonumber(val)
 	if n ~= nil and math.floor(n) == n then
 		return true
@@ -53,6 +53,11 @@ function int(val)
 	return false
 end
 
+function ufloat(val)
+	local n = tonumber(val)
+	return ( n ~= nil and n >= 0 )
+end
+
 function float(val)
 	return ( tonumber(val) ~= nil )
 end