libs/web: allow '!' and '.' symbols in phonedigit datatype

diff --git a/libs/web/htdocs/luci-static/resources/cbi.js b/libs/web/htdocs/luci-static/resources/cbi.js
index e89658d..02814a5 100644 (file)
--- a/libs/web/htdocs/luci-static/resources/cbi.js
+++ b/libs/web/htdocs/luci-static/resources/cbi.js
@@ -299,7 +299,7 @@ var cbi_validators = {
        },
        'phonedigit': function()
        {
        },
        'phonedigit': function()
        {

-               return (this.match(/^[0-9\*#]+$/) != null);
+               return (this.match(/^[0-9\*#!\.]+$/) != null);

        }
 };
 
        }
 };
 

diff --git a/libs/web/luasrc/cbi/datatypes.lua b/libs/web/luasrc/cbi/datatypes.lua
index 32530c4..c5f4ec0 100644 (file)
--- a/libs/web/luasrc/cbi/datatypes.lua
+++ b/libs/web/luasrc/cbi/datatypes.lua
@@ -341,5 +341,5 @@ function maxlength(val, max)
 end
 
 function phonedigit(val)
 end
 
 function phonedigit(val)

-       return (val:match("^[0-9\*#]+$") ~= nil)
+       return (val:match("^[0-9\*#!%.]+$") ~= nil)

 end
 end