summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2017-03-27 16:38:20 +0000
committerazul <azul@riseup.net>2017-03-27 16:38:20 +0000
commitd53ff24edb72f35b710cb300738c330316475de5 (patch)
tree7623101cb8f65cd9477d7bc61dabcd18fa02ef1e /app/assets
parent9beeee8aa2d1656e7c80e54137156e7922737aa5 (diff)
parentb1b523f08a9ce7ea5fe0d50dc8b86995e00b48d6 (diff)
Merge branch 'fix/bootstrap-3' into 'master'
Fix/bootstrap 3 See merge request !31
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/users.js57
1 files changed, 15 insertions, 42 deletions
diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js
index 4b5198f..9a10532 100644
--- a/app/assets/javascripts/users.js
+++ b/app/assets/javascripts/users.js
@@ -1,13 +1,6 @@
(function() {
- var settings = {
- "error_class":"help-inline",
- "error_tag":"span",
- "wrapper_error_class":"error",
- "wrapper_tag":"div",
- "wrapper_class":"form-group"
- }
//
// LOCAL FUNCTIONS
@@ -17,9 +10,8 @@
poll_identities,
prevent_default,
clear_errors,
- clear_field_errors,
validate_password_confirmation,
- validate_password_length,
+ signup,
update_user;
prevent_default = function(event) {
@@ -42,8 +34,13 @@
return $('#messages').empty();
};
- clear_field_errors = function() {
- return $(settings.error_tag + '.' + settings.error_class).remove();
+ signup = function(submitEvent) {
+ var form = submitEvent.target;
+ var validations = form.ClientSideValidations
+ if ( ( typeof validations === 'undefined' ) ||
+ $(form).isValid(validations.settings.validators) ) {
+ srp.signup();
+ }
};
update_user = function(submitEvent) {
@@ -75,19 +72,6 @@
}
};
- validate_password_length = function(submitEvent) {
- var form = submitEvent.target;
- var password = $(form).find('input#srp_password').val();
- if (password.length > 7) {
- return true;
- }
- else {
- displayFieldError("password", "needs to be at least 8 characters long.");
- submitEvent.stopImmediatePropagation()
- return false;
- }
- };
-
var account = {
// Returns the user's identity
@@ -175,24 +159,15 @@
var message = $.isArray(error) ? error[0] : error;
var element = $('form input[name$="[' + field + ']"]');
if (element) {
- addError(element, settings, message);
+ addError(element, message);
}
};
- function addError(element, settings, message) {
- var errorElement, wrapper;
-
- errorElement = element.parent().find("" + settings.error_tag + "." + settings.error_class);
- wrapper = element.closest(settings.wrapper_tag + '.' + settings.wrapper_class);
- if (errorElement[0] == null) {
- errorElement = $("<" + settings.error_tag + "/>", {
- "class": settings.error_class,
- text: message
- });
- element.after(errorElement);
- }
- wrapper.addClass(settings.wrapper_error_class);
- return errorElement.text(message);
+ function addError(element, message) {
+ var form = element.closest('form');
+ var settings = form[0].ClientSideValidations.settings;
+ ClientSideValidations.formBuilders['SimpleForm::FormBuilder'].add(element, settings, message);
+
}
//
@@ -203,10 +178,8 @@
$('.hidden.js-show').removeClass('hidden');
$('.js-show').show();
$('#new_user').submit(prevent_default);
- $('#new_user').submit(clear_field_errors);
- $('#new_user').submit(validate_password_length);
$('#new_user').submit(validate_password_confirmation);
- $('#new_user').submit(srp.signup);
+ $('#new_user').submit(signup);
$('#new_session').submit(prevent_default);
$('#new_session').submit(srp.login);
$('#update_login_and_password').submit(prevent_default);