Merge remote-tracking branch 'origin/MAGETWO-53319' into BUGS

slavvka · slavvka · commit 88e0a1fa9d6b · 2016-06-03T12:43:46.000+03:00
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
@@ -1017,7 +1017,7 @@
                 if ($.mage.isEmpty(value)) {
                     return true;
                 }
-                var valid_regexp = /^[a-z0-9\._-]{1,30}@([a-z0-9_-]{1,30}\.){1,5}[a-z]{2,4}$/i,
+                var valid_regexp = /^([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*@([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*\.(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]){2,})$/i,
                     emails = value.split(/[\s\n\,]+/g);
                 for (var i = 0; i < emails.length; i++) {
                     if (!valid_regexp.test(emails[i].trim())) {

Original file line number	Diff line number	Diff line change
`@@ -1017,7 +1017,7 @@`
`1017`	`1017`	`if ($.mage.isEmpty(value)) {`
`1018`	`1018`	`return true;`
`1019`	`1019`	`}`
`1020`		`- var valid_regexp = /^[a-z0-9\._-]{1,30}@([a-z0-9_-]{1,30}\.){1,5}[a-z]{2,4}$/i,`
	`1020`	+ var valid_regexp = /^([a-z0-9,!\#\$%&'\\+\/=\?\^_`\{\\|\}~-]\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9,!\#\$%&'\\+\/=\?\^_`\{\\|\}~-]\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)@([a-z0-9-]\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9-]\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)\.(([a-z]\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]){2,})$/i,
`1021`	`1021`	`emails = value.split(/[\s\n\,]+/g);`
`1022`	`1022`	`for (var i = 0; i < emails.length; i++) {`
`1023`	`1023`	`if (!valid_regexp.test(emails[i].trim())) {`