Skip to content

Hide/show email error messages via HTML5 hidden attribute (LG-2996) #3773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zachmargolis merged 2 commits into from
May 15, 2020
Merged

Hide/show email error messages via HTML5 hidden attribute (LG-2996) #3773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
feda663
Hide/show email error messages via HTML5 hidden attribute
zachmargolis May 15, 2020
6da5439
Fix some specs
zachmargolis May 15, 2020
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
18 changes: 14 additions & 4 deletions app/javascript/packs/email-validation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ function emailValidation() {
const email = document.querySelector('input[type="email"]');
let blurTimer;

function hideElem(elem) {
elem.classList.add('hide');
elem.hidden = true;
}

function showElem(elem) {
elem.classList.remove('hide');
elem.hidden = false;
}

// remove focus from the email input after error is displayed
function blurEmailInput(input) {
blurTimer = setTimeout(function () {
Expand All @@ -14,15 +24,15 @@ function emailValidation() {

function resetEmailInvalid(input) {
input.classList.remove('usa-input--error');
alert.classList.add('hide');
alertInline.classList.add('hide');
hideElem(alert);
hideElem(alertInline);
clearTimeout(blurTimer);
}

function displayEmailInvalid(input) {
input.classList.add('usa-input--error');
alert.classList.remove('hide');
alertInline.classList.remove('hide');
showElem(alert);
showElem(alertInline);
blurEmailInput(input);
}

Expand Down
4 changes: 2 additions & 2 deletions app/views/sign_up/registrations/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<%= render 'shared/sp_alert' %>

<div class='email-invalid-alert usa-alert margin-bottom-2 usa-alert--error hide'>
<div class='email-invalid-alert usa-alert margin-bottom-2 usa-alert--error hide' hidden='true'>
<div class='usa-alert__body'>
<p class='usa-alert__text'>
<%= t('sign_up.email.invalid_email_alert_head') %>
Expand All @@ -17,7 +17,7 @@
html: { autocomplete: 'off', role: 'form' },
url: sign_up_register_path) do |f| %>
<%= f.input :email, label: t('forms.registration.labels.email'), required: true %>
<span class='email-invalid-alert-inline usa-error-message margin-top-neg-3 margin-bottom-3 hide' role='alert'>
<span class='email-invalid-alert-inline usa-error-message margin-top-neg-3 margin-bottom-3 hide' role='alert' hidden='true'>
<%= t('sign_up.email.invalid_email_alert_inline') %>
</span>
<%= f.input :request_id, as: :hidden, input_html: { value: params[:request_id] || request_id } %>
Expand Down
6 changes: 3 additions & 3 deletions spec/features/visitors/sign_up_with_email_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
expect(Funnel::Registration::TotalRegisteredCount.call).to eq(0)
end

scenario 'visitor cannot sign up with invalid email address' do
scenario 'visitor cannot sign up with invalid email address', js: true do
sign_up_with('bogus')
expect_email_invalid(page)
end
Expand All @@ -26,11 +26,11 @@

invalid_addresses.each do |email|
sign_up_with(email)
expect_email_invalid(page)
expect(page).to have_content(t('valid_email.validations.email.invalid'))
end
end

scenario 'visitor cannot sign up with empty email address' do
scenario 'visitor cannot sign up with empty email address', js: true do
sign_up_with('')

expect_email_invalid(page)
Expand Down