Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

Hubert / e-mail input wouldn't show error after making valid e-mail address invalid again. #6684

Merged
mamali-fs merged 20 commits into from
Sep 7, 2021
Merged

Hubert / e-mail input wouldn't show error after making valid e-mail address invalid again. #6684

Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
87a2e4c
fixing clearError function hiding the wrong element.
Jul 15, 2021
f50c903
merging
Jul 15, 2021
7f723da
changing regex
Jul 20, 2021
97ef460
merging
Jul 20, 2021
7d7d5b7
allow capital letters
Jul 20, 2021
cf5ddb0
refactoring code
Jul 28, 2021
1dec46a
merging
Jul 28, 2021
c6befcc
refactoring code
Jul 28, 2021
b2af36d
refactoring code
Jul 29, 2021
9086a74
merging
Jul 29, 2021
08e7c65
refactoring code
Jul 29, 2021
23b4c87
refactoring code
Aug 2, 2021
9967265
merging
Aug 2, 2021
119e042
updating regex
Aug 2, 2021
27380dc
adjusting regex
Aug 2, 2021
5b822a9
adjusting regex
Aug 3, 2021
34534b1
updating regex
Aug 3, 2021
6a71b4a
updating regex
Aug 3, 2021
9e43808
updating regex
Aug 3, 2021
7572192
resolving conflict
Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/javascript/app/common/form_validation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ const Validation = (() => {
// ----- Validation Methods -----
// ------------------------------

const validEmail = value => /^(([a-zA-Z0-9][^!@£$%^&*=/?§±~<>(){}[\]\\.,;:\s@"'`]+(\.[^!@£$%^&*=/?§±~<>(){}[\]\\.,;:\s@"'`]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z0-9]+\.)+[a-zA-Z]{2,}))$/.test(value);
const validEmail = value => /^[a-zA-Z0-9]+(?:(?!.*([.+_-])\1+)[a-zA-Z0-9.+_-]+)*[a-zA-Z0-9]@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z](?:[a-zA-Z-]*[a-zA-Z]){1,}?$/.test(value);

const validRequired = (value, options, field) => {
if (value.length) return true;
// else
Expand Down Expand Up @@ -314,8 +315,8 @@ const Validation = (() => {
}

let all_is_ok = true;
let message = '';
const field_type = field.$.attr('type');
let message_template = '';

field.validations.some((valid) => {
if (!valid) return false; // check next validation
Expand Down Expand Up @@ -346,13 +347,13 @@ const Validation = (() => {
}

if (!field.is_ok) {
message = options.message || ValidatorsMap.get(type).message;
message_template = options.message || ValidatorsMap.get(type).message;
if (type === 'length') {
message = template(message, [options.min === options.max ? options.min : `${options.min}-${options.max}`]);
message_template = template(message_template, [options.min === options.max ? options.min : `${options.min}-${options.max}`]);
} else if (type === 'min') {
message = template(message, [options.min]);
message_template = template(message_template, [options.min]);
} else if (type === 'not_equal') {
message = template(message, [options.name1, options.name2]);
message_template = template(message_template, [options.name1, options.name2]);
}
all_is_ok = false;
return true; // break on the first error found
Expand All @@ -361,7 +362,7 @@ const Validation = (() => {
});

if (!all_is_ok) {
showError(field, message);
showError(field, message_template);
} else {
clearError(field);
}
Expand All @@ -378,11 +379,10 @@ const Validation = (() => {
}
};

const showError = (field, localized_message) => {
if (field.$error.html() === localized_message && field.$error.is(':visible')) return;
clearError(field);
const showError = (field, message) => {
Password.removeCheck(field.selector);
field.$error.html(localized_message).setVisibility(1);
field.$error.text(message);
field.$error.setVisibility(1);
};

const validate = (form_selector) => {
Expand Down