diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2013-02-05 13:15:48 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2013-02-05 13:15:48 +0000 |
| commit | c6712bdc3c653d694d61bab01628f1621bcb73a3 (patch) | |
| tree | c5ae9c5d8468a059170d0106aac5a51a6e8317b8 /libs | |
| parent | f60197c15c8ba0ec26cacf2496aa784da25ffae8 (diff) | |
libs/web: allow '!' and '.' symbols in phonedigit datatype
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/web/htdocs/luci-static/resources/cbi.js | 2 | ||||
| -rw-r--r-- | libs/web/luasrc/cbi/datatypes.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/web/htdocs/luci-static/resources/cbi.js b/libs/web/htdocs/luci-static/resources/cbi.js index e89658dc9..02814a542 100644 --- 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() { - 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 32530c465..c5f4ec0f0 100644 --- 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) - return (val:match("^[0-9\*#]+$") ~= nil) + return (val:match("^[0-9\*#!%.]+$") ~= nil) end |