Changeset 7165

Timestamp:

06/17/11 11:52:49 (2 years ago)

Author:

jow

Message:

libs/web: add new datatypes min(...), max(...) and neg_network_ip4addr

Location:

luci/trunk/libs/web

Files:

• htdocs/luci-static/resources/cbi.js (modified) (4 diffs)
• luasrc/cbi/datatypes.lua (modified) (2 diffs)

luci/trunk/libs/web/htdocs/luci-static/resources/cbi.js

@@ -3 +3 @@
 
     Copyright 2008 Steven Barth <steven@midlink.org>
-    Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
+    Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -154 +154 @@
     {   if ( v.length <= 253 )
             return (v.match(/^[a-zA-Z0-9][a-zA-Z0-9\-.]*[a-zA-Z0-9]$/) != null);
+
+        return false;
     },
 
@@ -180 +182 @@
     },
 
+    'neg_network_ip4addr': function(v)
+    {
+        v = v.replace(/^\s*!/, "");
+        return cbi_validators.uciname(v) || cbi_validators.ip4addr(v);      
+    },
+
     'range': function(v, args)
     {
@@ -188 +196 @@
         if (!isNaN(min) && !isNaN(max) && !isNaN(val))
             return ((val >= min) && (val <= max));
+
+        return false;
+    },
+
+    'min': function(v, args)
+    {
+        var min = parseInt(args[0]);
+        var val = parseInt(v);
+
+        if (!isNaN(min) && !isNaN(val))
+            return (val >= min);
+
+        return false;
+    },
+
+    'max': function(v, args)
+    {
+        var max = parseInt(args[0]);
+        var val = parseInt(v);
+
+        if (!isNaN(max) && !isNaN(val))
+            return (val <= max);
 
         return false;

luci/trunk/libs/web/luasrc/cbi/datatypes.lua

@@ -228 +228 @@
 end
 
+function neg_network_ip4addr(val)
+    if type(v) == "string" then
+        v = v:gsub("^%s*!", "")
+        return (uciname(v) or ip4addr(v))
+    end 
+end
+
 function range(val, min, max)
     val = tonumber(val)
@@ -239 +246 @@
     return false
 end
+
+function min(val, min)
+    val = tonumber(val)
+    min = tonumber(min)
+
+    if val ~= nil and min ~= nil then
+        return (val >= min)
+    end
+
+    return false
+end
+
+function max(val, max)
+    val = tonumber(val)
+    max = tonumber(max)
+
+    if val ~= nil and max ~= nil then
+        return (val <= max)
+    end
+
+    return false
+end