From b1b523f08a9ce7ea5fe0d50dc8b86995e00b48d6 Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 24 Mar 2017 12:08:50 +0100 Subject: upgrade: simple_form to bootstrap 3 * reran the simple form initializer. * wrapped submit buttons are now broken and need a fix. * disabled confirmation validation in client side validations as the error message always is attached to the wrong field. --- app/assets/javascripts/users.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'app/assets') diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js index 59478a6..9a10532 100644 --- a/app/assets/javascripts/users.js +++ b/app/assets/javascripts/users.js @@ -10,6 +10,7 @@ poll_identities, prevent_default, clear_errors, + validate_password_confirmation, signup, update_user; @@ -57,6 +58,20 @@ }); }; + validate_password_confirmation = function(submitEvent) { + var form = submitEvent.target; + var password = $(form).find('input#srp_password').val(); + var confirmation = $(form).find('input#srp_password_confirmation').val(); + if (password === confirmation) { + return true; + } + else { + displayFieldError("password_confirmation", "does not match."); + submitEvent.stopImmediatePropagation() + return false; + } + }; + var account = { // Returns the user's identity @@ -163,6 +178,7 @@ $('.hidden.js-show').removeClass('hidden'); $('.js-show').show(); $('#new_user').submit(prevent_default); + $('#new_user').submit(validate_password_confirmation); $('#new_user').submit(signup); $('#new_session').submit(prevent_default); $('#new_session').submit(srp.login); -- cgit v1.2.3