Skip to content

Commit 2178204

Browse files
committed
Fix validate-emails rule for ui component
- Fix wrong method `strip()` => `trim()` - Sync logic with `lib/web/mage/validation.js`
1 parent 6e47ef3 commit 2178204

File tree

1 file changed

+3
-2
lines changed
  • app/code/Magento/Ui/view/base/web/js/lib/validation

1 file changed

+3
-2
lines changed

app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -879,17 +879,18 @@ define([
879879
}
880880
],
881881
'validate-emails': [
882+
// TODO: logic is same in lib/web/mage/validation.js. Should we uniform?
882883
function (value) {
883884
var validRegexp, emails, i;
884885

885886
if (utils.isEmpty(value)) {
886887
return true;
887888
}
888-
validRegexp = /^[a-z0-9\._-]{1,30}@([a-z0-9_-]{1,30}\.){1,5}[a-z]{2,4}$/i;
889+
validRegexp = /^([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; //eslint-disable-line max-len
889890
emails = value.split(/[\s\n\,]+/g);
890891

891892
for (i = 0; i < emails.length; i++) {
892-
if (!validRegexp.test(emails[i].strip())) {
893+
if (!validRegexp.test(emails[i].trim())) {
893894
return false;
894895
}
895896
}

0 commit comments

Comments
 (0)