diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-12-16 19:45:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-16 19:45:17 +0100 |
| commit | 7efef7db9ed6f7b25a28166c1b75a28adbaf7cdb (patch) | |
| tree | ad8ebb28e0466649785afa167e8711debb271e68 /app/javascript/packs/public.js | |
| parent | d911c17f521d6b13861caa886715a50b644007a1 (diff) | |
| parent | 50d62fe2e749a5ab2b2bed81d5a9449b5e733964 (diff) | |
Merge pull request #1648 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/packs/public.js')
| -rw-r--r-- | app/javascript/packs/public.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js index 2166d8df0..7ebe8b4d0 100644 --- a/app/javascript/packs/public.js +++ b/app/javascript/packs/public.js @@ -103,7 +103,9 @@ function main() { delegate(document, '#registration_user_password_confirmation,#registration_user_password', 'input', () => { const password = document.getElementById('registration_user_password'); const confirmation = document.getElementById('registration_user_password_confirmation'); - if (password.value && password.value !== confirmation.value) { + if (confirmation.value && confirmation.value.length > password.maxLength) { + confirmation.setCustomValidity((new IntlMessageFormat(messages['password_confirmation.exceeds_maxlength'] || 'Password confirmation exceeds the maximum password length', locale)).format()); + } else if (password.value && password.value !== confirmation.value) { confirmation.setCustomValidity((new IntlMessageFormat(messages['password_confirmation.mismatching'] || 'Password confirmation does not match', locale)).format()); } else { confirmation.setCustomValidity(''); @@ -115,7 +117,9 @@ function main() { const confirmation = document.getElementById('user_password_confirmation'); if (!confirmation) return; - if (password.value && password.value !== confirmation.value) { + if (confirmation.value && confirmation.value.length > password.maxLength) { + confirmation.setCustomValidity((new IntlMessageFormat(messages['password_confirmation.exceeds_maxlength'] || 'Password confirmation exceeds the maximum password length', locale)).format()); + } else if (password.value && password.value !== confirmation.value) { confirmation.setCustomValidity((new IntlMessageFormat(messages['password_confirmation.mismatching'] || 'Password confirmation does not match', locale)).format()); } else { confirmation.setCustomValidity(''); |