summaryrefslogtreecommitdiffstats
path: root/web/react/utils/utils.jsx
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-19 10:25:51 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-19 10:25:51 -0700
commit468f01dc895000211e62eb8a16feaa84ceb354ed (patch)
tree4868b46316bb79cf5c127f5b0638f3383a7c971c /web/react/utils/utils.jsx
parenta8f3f76c592928a0907fbaddd71ab6b8f68d28d6 (diff)
parentea1b3129688dd76c80c7d41eec4f2eb60f9f0639 (diff)
downloadchat-468f01dc895000211e62eb8a16feaa84ceb354ed.tar.gz
chat-468f01dc895000211e62eb8a16feaa84ceb354ed.tar.bz2
chat-468f01dc895000211e62eb8a16feaa84ceb354ed.zip
Merging from master
Diffstat (limited to 'web/react/utils/utils.jsx')
-rw-r--r--web/react/utils/utils.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 561c2c4c4..38ac68d58 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -13,7 +13,8 @@ var client = require('./client.jsx');
var Autolinker = require('autolinker');
export function isEmail(email) {
- var regex = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+ //var regex = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+ var regex = /^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i;
return regex.test(email);
}