From ca6c5bd4fa4463048d70a176b28ea1be80c3d63b Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Wed, 30 Oct 2013 18:36:19 +0100 Subject: [PATCH] improve modal register error display --- js/materio_user.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/materio_user.js b/js/materio_user.js index cea40c0a..88fb1ff1 100755 --- a/js/materio_user.js +++ b/js/materio_user.js @@ -83,7 +83,7 @@ MaterioUser = function(){ dataType:'json', url: Drupal.settings.basePath+Drupal.settings.pathPrefix+"materio_user/register/submit", data: $('#user-register-form', $modal).serialize(), - success: function(data) { onUserLoginRegisterSubmit(data, destination);}, + success: function(data) { onUserLoginRegisterSubmit($('#user-register-form'), data, destination);}, error: function() {trace('error');} }); return false; @@ -96,7 +96,7 @@ MaterioUser = function(){ dataType:'json', url: Drupal.settings.basePath+Drupal.settings.pathPrefix+"materio_user/login/submit", data: $('#user-login', $modal).serialize(), - success: function(data){ onUserLoginRegisterSubmit(data, destination); }, + success: function(data){ onUserLoginRegisterSubmit($('#user-login'), data, destination); }, error: function() { trace('error'); } }); return false; @@ -115,12 +115,12 @@ MaterioUser = function(){ }); }; - function onUserLoginRegisterSubmit(data, destination){ + function onUserLoginRegisterSubmit($form, data, destination){ cleanModalErrors(); if(data.errors != null){ for(field in data.errors){ - $('#user-login input[name='+field+']', '.modal-content').addClass('error'); - $('.modal-content').prepend($('
').addClass('message-error').html(data.errors[field])); + $('input[name='+field+']', $form).addClass('error'); + $form.prepend($('
').addClass('message-error').html(data.errors[field])); } }else{ window.location.pathname = destination;