From fd9b41c10fae2094e21dd9e32b716a3c062663dc Mon Sep 17 00:00:00 2001
From: WMDE-Fisch <christoph.fischer@wikimedia.de>
Date: Mon, 28 Dec 2015 15:15:25 +0100
Subject: [PATCH] add methods to show and hide errors

---
 js/common-banner.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/js/common-banner.js b/js/common-banner.js
index 70e78f2..e116ff3 100644
--- a/js/common-banner.js
+++ b/js/common-banner.js
@@ -251,17 +251,19 @@ function validateForm() {
 
 	// Check amount is at least the minimum
 	if ( amount < 1 || error ) {
-		alert( amountTooLowMessage );
+		showAmountError( amountTooLowMessage );
 		return false;
 	} else if ( amount > 99999 ) {
-		alert( amountTooHighMessage );
+		showAmountError( amountTooHighMessage );
 		return false;
+	} else {
+		hideAmountError();
 	}
 	return amount;
 }
 
-function showAmountError() {
-	$( '#WMDE_Banner-amounts-error-text' ).show();
+function showAmountError( text ) {
+	$( '#WMDE_Banner-amounts-error-text' ).text( text ).show();
 	$( '#WMDE_Banner-amounts' ).addClass( 'fieldset-error' );
 }
 
@@ -270,8 +272,8 @@ function hideAmountError() {
 	$( '#WMDE_Banner-amounts' ).removeClass( 'fieldset-error' );
 }
 
-function showFrequencyError() {
-	$( '#WMDE_Banner-frequency-error-text' ).show();
+function showFrequencyError( text ) {
+	$( '#WMDE_Banner-frequency-error-text' ).text( text ).show();
 	$( '#WMDE_Banner-frequency' ).addClass( 'fieldset-error' );
 }
 
@@ -289,7 +291,7 @@ function validateAndSetPeriod() {
 	var form = document.donationForm;
 	if ( $( '#interval_multiple' ).is( ':checked' ) ) {
 		if ( $( 'input[name=interval]:checked', form ).length !== 1 ) {
-			alert( noIntervalSelectedMessage );
+			showFrequencyError( noIntervalSelectedMessage );
 			return false;
 		} else {
 			$( '#intervalType' ).val( '1' );
@@ -299,9 +301,10 @@ function validateAndSetPeriod() {
 		$( '#periode' ).val( '0' );
 		$( '#intervalType' ).val( '0' );
 	} else {
-		alert( noIntervalSelectedMessage );
+		showFrequencyError( noIntervalSelectedMessage );
 		return false;
 	}
+	hideFrequencyError();
 	return true;
 }