From 3282ddaa098463adc778a2a81f5239769c922f65 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Thu, 7 May 2015 16:50:29 +0300 Subject: Register form + validation --- src/js/Botleagues.js | 4 ++-- src/js/BotleaguesCallback.js | 33 ++++++++++++++++++++++++++++----- src/js/BotleaguesFrontend.js | 21 +++++++++++++++++++++ src/js/forms.js | 1 + 4 files changed, 52 insertions(+), 7 deletions(-) (limited to 'src/js') diff --git a/src/js/Botleagues.js b/src/js/Botleagues.js index efc56d8..f9d34b7 100644 --- a/src/js/Botleagues.js +++ b/src/js/Botleagues.js @@ -7,8 +7,8 @@ Botleagues.request = function(user_options, callback) { endpoint: null, method: 'GET', dataType: 'json', - done: function(data) { - callback(data); + complete: function(data) { + callback(data.responseJSON); } }; for (var name in user_options) { diff --git a/src/js/BotleaguesCallback.js b/src/js/BotleaguesCallback.js index 1efe8d6..f162e7c 100644 --- a/src/js/BotleaguesCallback.js +++ b/src/js/BotleaguesCallback.js @@ -1,9 +1,32 @@ function BotleaguesCallback(){} BotleaguesCallback.register = function(data) { - console.log(data); -}; + $('form.form-register .form-group') + .removeClass('has-feedback has-success has-warning, has-error') + .find('.form-control-feedback').remove(); -BotleaguesCallback.login = function(data) { - console.log(data); -} \ No newline at end of file + if (typeof data.error !== 'undefined') { + BotleaguesFrontend.error({message: data.error, prepend_to: $('form.form-register')}); + if (typeof data.errors !== 'undefined') { + for (var key in data.errors) { + var error_msg = data.errors[key].join('; '); + + $('#register-' + key) + .attr('title', error_msg) + .parent() + .addClass('has-feedback has-error') + .append( + $('') + .addClass('glyphicon glyphicon-remove form-control-feedback') + .attr('aria-hidden', true) + ) + .find('label') + .append( + $('') + .addClass('pull-right text-danger') + .text(error_msg) + ); + } + } + } +}; \ No newline at end of file diff --git a/src/js/BotleaguesFrontend.js b/src/js/BotleaguesFrontend.js index 461ce92..e9ab570 100644 --- a/src/js/BotleaguesFrontend.js +++ b/src/js/BotleaguesFrontend.js @@ -1,5 +1,26 @@ function BotleaguesFrontend(){} +BotleaguesFrontend.error = function(user_options) { + options = { + dismissable: true, + prepend_to: $('#messages'), + type: 'danger' + }; + for (var key in user_options) { + options[key] = user_options[key]; + } + + var html = '
'; + if (options.dismissable === true) + html += '×'; + html += options.message; + html += '
'; + + html = $(html); + + html.prependTo(options.prepend_to).delay(3000).fadeOut().queue(html.remove); +}; + BotleaguesFrontend.login = function() { Botleagues.redirect({ endpoint: 'user/login?redirect=http://local.botleagues.camilstaps.nl/' diff --git a/src/js/forms.js b/src/js/forms.js index 5ad9959..24f0f43 100644 --- a/src/js/forms.js +++ b/src/js/forms.js @@ -7,5 +7,6 @@ $('form.form-register').submit(function(){ password: $(this).find('input[name="password"]').val() } }, BotleaguesCallback.register); + event.preventDefault(); }); \ No newline at end of file -- cgit v1.2.3