From e7165306925aa9abc4a437bc18d73eb509ff75a3 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Mon, 25 Mar 2013 14:52:13 -0400 Subject: [PATCH] edx.org - added necessary JS and Sass to disabled login/register button when form is submitting --- lms/static/sass/multicourse/_account.scss | 1 + lms/templates/login.html | 22 ++++++++--- lms/templates/register.html | 47 ++++++++++++++--------- 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/lms/static/sass/multicourse/_account.scss b/lms/static/sass/multicourse/_account.scss index e274a966aa..58801491fe 100644 --- a/lms/static/sass/multicourse/_account.scss +++ b/lms/static/sass/multicourse/_account.scss @@ -392,6 +392,7 @@ &:disabled { opacity: 0.3; + cursor: default !important; } } diff --git a/lms/templates/login.html b/lms/templates/login.html index ad5c81b4eb..6627da6e18 100644 --- a/lms/templates/login.html +++ b/lms/templates/login.html @@ -26,16 +26,13 @@ }).blur(function() { $("label").parent().removeClass("is-focused"); }); - }); - - - + })(this); + function toggleSubmitButton(e) { + var $msgError = $('form .status.submission-error'); + var $submitButton = $('form .form-actions #submit'); + + if(!$msgError.hasClass('is-shown')) { + $submitButton.prop('disabled', true); + } + + else { + $submitButton.prop('disabled', false); + } + } +
diff --git a/lms/templates/register.html b/lms/templates/register.html index 636435444b..cfd61eeec2 100644 --- a/lms/templates/register.html +++ b/lms/templates/register.html @@ -33,6 +33,34 @@ }); }); + + (function() { + $(document).delegate('#register-form', 'ajax:success', function(data, json, xhr) { + if(json.success) { + $('.message.submission-error').removeClass('is-shown'); + toggleSubmitButton(); + location.href="${reverse('dashboard')}"; + } else { + $('.status.message.submission-error').addClass('is-shown'); + $('.status.message.submission-error .message-copy').html(json.value).stop().css("display", "block"); + $(".field-error").removeClass('field-error'); + $("[data-field='"+json.field+"']").addClass('field-error') + } + }); + })(this); + + function toggleSubmitButton(e) { + var $msgError = $('form .status.submission-error'); + var $submitButton = $('form .form-actions #submit').prop('disabled', true); + + if(!$msgError.hasClass('is-shown')) { + $submitButton.prop('disabled', true); + } + + else { + $submitButton.prop('disabled', false); + } + } @@ -208,21 +236,4 @@

Need help in registering with edX? View our FAQs for answers to commonly asked questions. Once registered, most questions can be answered in the course specific discussion forums or through the FAQs.

-
- - - - + \ No newline at end of file