summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2014-04-25 19:19:24 +0200
committerazul <azul@riseup.net>2014-04-25 19:19:24 +0200
commit55fcdd3975baf6f6e167ab5164203ab9a2245186 (patch)
tree12eb857eb3475ff2895120ec29421cee2502a4c5 /app/assets/javascripts
parentb7dc6ee5220a2d7865bdd86eb86e1fbed4ca28d3 (diff)
parenta2909d781a790e47acbdbb8b4560177100ad9942 (diff)
Merge pull request #153 from azul/bugfix/5557-password-validations
basic password validation without client side gem
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/users.js80
1 files changed, 71 insertions, 9 deletions
diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js
index 4a86ef5..fa20399 100644
--- a/app/assets/javascripts/users.js
+++ b/app/assets/javascripts/users.js
@@ -1,13 +1,24 @@
(function() {
+
+
+ var settings = {
+ "error_class":"help-inline",
+ "error_tag":"span",
+ "wrapper_error_class":"error",
+ "wrapper_tag":"div",
+ "wrapper_class":"control-group"
+ }
+
//
// LOCAL FUNCTIONS
//
- var poll_users,
- prevent_default,
- form_failed,
- form_passed,
+ var poll_users,
+ prevent_default,
clear_errors,
+ clear_field_errors,
+ validate_password_confirmation,
+ validate_password_length,
update_user;
prevent_default = function(event) {
@@ -24,6 +35,10 @@
return $('#messages').empty();
};
+ clear_field_errors = function() {
+ return $(settings.error_tag + '.' + settings.error_class).remove();
+ };
+
update_user = function(submitEvent) {
var form = submitEvent.target;
var token = form.dataset.token;
@@ -38,7 +53,34 @@
$(form).find('.btn[type="submit"]').button('reset');
});
};
-
+
+ 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;
+ }
+ };
+
+ 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;
+ }
+ };
+
//
// PUBLIC FUNCTIONS
//
@@ -90,18 +132,38 @@
}
function displayFieldError(field, error) {
+ var message = $.isArray(error) ? error[0] : error;
var element = $('form input[name$="[' + field + ']"]');
if (element) {
- element.trigger('element:validate:fail.ClientSideValidations', error).data('valid', false);
+ addError(element, settings, message);
}
};
- //
- // INIT
- //
+ 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);
+ }
+
+//
+// INIT
+//
$(document).ready(function() {
$('#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_session').submit(prevent_default);
$('#new_session').submit(srp.login);