Conservancy/website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

supporter: Refactor amount-checking JavaScript.

Browse source 
* Separate out amount-parsing and reacting into separate events.  This sets
  the stage for other elements to react to the custom
  'conservancy:newamount' event.
* Set up events in the context of each supporter form, with closures.  This
  lets us avoid weird CSS selector gymnastics in the event, and instead
  drill down from the form to find the elements we need.

There are no functional changes in this code, barring bugs.
This commit is contained in:
Brett Smith 2017-01-08 18:23:51 -05:00
parent 5f9a4395f3
commit cb5b5ec23f
1 changed files with 51 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
www/conservancy/static/js/supporter-page.js
View file

@ -5,19 +5,23 @@
** Find a copy of GPL at https://sfconservancy.org/GPLv3 ** Find a copy of GPL at https://sfconservancy.org/GPLv3
*/ */
var NEW_AMOUNT_EVENT = 'conservancy:newamount';
var flipClass = function(elem, byeClass, hiClass) { var flipClass = function(elem, byeClass, hiClass) {
var classList = elem.classList; var classList = elem.classList;
classList.remove(byeClass); classList.remove(byeClass);
classList.add(hiClass); classList.add(hiClass);
} }
var checkAmountValid = function(amountInput) { var buildAmountData = function(amountInput) {
var value = parseFloat(amountInput.value); var amountData = {
var min = parseFloat(amountInput.min); minAmount: parseFloat(amountInput.min),
/* Is the value is a valid float, it will stringify back to itself. */ newAmount: parseFloat(amountInput.value),
var isValid = (String(value) === amountInput.value) && (value >= min); }
amountInput.dataset.valid = isValid ? '1' : '0'; if (amountInput.dataset.oldAmount !== undefined) {
return isValid; amountData.oldAmount = parseFloat(amountInput.dataset.oldAmount);
}
return amountData;
} }
var supportTypeSelector = function(supportTypeHash) { var supportTypeSelector = function(supportTypeHash) {
@ -45,32 +49,40 @@ $(document).ready(function() {
var $formCorrectionNeeded = $('#form-correction-needed'); var $formCorrectionNeeded = $('#form-correction-needed');
$formCorrectionNeeded.addClass('hidden'); $formCorrectionNeeded.addClass('hidden');
$('form.supporter-form input[type=number]').on('input', function(event) { $('form.supporter-form').each(function(index, form) {
event.target.classList.remove('invalid'); var $amountInput = $('input[type=number]', form).first();
}).on('focusout', function(event) { var $amountError = $('.form-error', $amountInput[0].parentNode);
var amountInput = event.target;
var wasValid = amountInput.dataset.valid === '1'; $amountError.on(NEW_AMOUNT_EVENT, function(event, amountData) {
var isValid = checkAmountValid(amountInput); var isValid = amountData.newAmount >= amountData.minAmount;
if (amountData.oldAmount === undefined) {
if (isValid) { if (isValid) {
flipClass(amountInput, 'invalid', 'valid'); $amountError.addClass('hidden');
if (!wasValid) {
$('.form-error', amountInput.parentNode).fadeOut();
}
} else if (wasValid) {
flipClass(amountInput, 'valid', 'invalid');
$('.form-error', amountInput.parentNode).fadeIn();
}
}).each(function(index, elem) {
if (checkAmountValid(elem)) {
$('.form-error', elem.parentNode).addClass('hidden');
} else { } else {
elem.classList.add('invalid'); flipClass($amountInput[0], 'valid', 'invalid');
$('.form-error', elem.parentNode).removeClass('hidden'); $amountError.removeClass('hidden');
}
} else if (isValid) {
flipClass($amountInput[0], 'invalid', 'valid');
$amountError.fadeOut();
} else if (amountData.oldAmount >= amountData.minAmount) {
flipClass($amountInput[0], 'valid', 'invalid');
$amountError.fadeIn();
} }
}); });
$('form.supporter-form').on('submit', function(event) { $amountInput.on('input', function(event) {
if (checkAmountValid($('input[name=amount]', event.target)[0])) { event.target.classList.remove('invalid');
}).on('focusout', function(event) {
var amountInput = event.target;
var amountData = buildAmountData(amountInput);
$amountError.trigger(NEW_AMOUNT_EVENT, amountData);
amountInput.dataset.oldAmount = amountData.newAmount;
}).trigger('focusout');
$(form).on('submit', function(event) {
var amountData = buildAmountData($amountInput[0]);
if (amountData.newAmount >= amountData.minAmount) {
$formCorrectionNeeded.addClass('hidden'); $formCorrectionNeeded.addClass('hidden');
} else { } else {
$formCorrectionNeeded.removeClass('hidden') $formCorrectionNeeded.removeClass('hidden')
@ -78,6 +90,7 @@ $(document).ready(function() {
event.preventDefault(); event.preventDefault();
} }
}); });
});
var selectSupportType = function(event) { var selectSupportType = function(event) {
var $selectedLink = $(event.target); var $selectedLink = $(event.target);