Katie Horn has submitted this change and it was merged.
Change subject: (FR #1090) trim inputs before validation
......................................................................
(FR #1090) trim inputs before validation
TODO: kill lots of repeated code
Change-Id: I768f014a8fb2a46952e0be91b3b974dc2def6a05
---
M modules/validate_input.js
1 file changed, 13 insertions(+), 11 deletions(-)
Approvals:
Katie Horn: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/validate_input.js b/modules/validate_input.js
index e4134ff..a3a9d6a 100644
--- a/modules/validate_input.js
+++ b/modules/validate_input.js
@@ -101,8 +101,10 @@
for( i = 0; i < numFields; i++ ) {
if ( document.getElementById( fields[i] ) ) { // Make sure
field exists
// See if the field is empty or equal to the placeholder
- if( !$( '#' + fields[i] ).hasClass( 'optional' )
- && ( document.getElementById( fields[i] ).value
== '' || document.getElementById( fields[i] ).value == mw.msg(
'donate_interface-donor-'+fields[i] ) ) ) {
+ if ( !$( '#' + fields[i] ).hasClass( 'optional' )
+ && ( !document.getElementById( fields[i]
).value.trim()
+ || document.getElementById( fields[i]
).value == mw.msg( 'donate_interface-donor-'+fields[i] ) )
+ ) {
currField = mw.msg(
'donate_interface-error-msg-' + fields[i] );
output += mw.msg(
'donate_interface-error-msg-js' ) + ' ' + currField + '.\r\n';
}
@@ -112,24 +114,24 @@
var stateField = document.getElementById( 'state' );
if ( stateField && stateField.type == 'select-one' ) { // state is a
dropdown select
var selectedState =
stateField.options[stateField.selectedIndex].value;
- if ( selectedState == 'YY' || selectedState == '' ) {
+ if ( selectedState == 'YY' || !selectedState.trim() ) {
output += mw.msg( 'donate_interface-error-msg-js' ) + '
' + mw.msg( 'donate_interface-state-province' ) + '.\r\n';
}
}
var countryField = document.getElementById( 'country' );
if ( countryField && countryField.type == 'select-one' ) { // country
is a dropdown select
- if ( countryField.options[countryField.selectedIndex].value ==
'' ) {
+ if (
!countryField.options[countryField.selectedIndex].value.trim() ) {
output += mw.msg( 'donate_interface-error-msg-js' ) + '
' + mw.msg( 'donate_interface-error-msg-country' ) + '.\r\n';
}
} else { // country is a hidden or text input
- if ( countryField.value == '' ) {
+ if ( !countryField.value.trim() ) {
output += mw.msg( 'donate_interface-error-msg-js' ) + '
' + mw.msg( 'donate_interface-error-msg-country' ) + '.\r\n';
}
}
// validate email address
- if( document.getElementById( 'emailAdd' ).value != '' &&
document.getElementById( 'emailAdd' ).value != mw.msg(
'donate_interface-donor-emailAdd' ) ) {
+ if( document.getElementById( 'emailAdd' ).value.trim() &&
document.getElementById( 'emailAdd' ).value != mw.msg(
'donate_interface-donor-emailAdd' ) ) {
var invalid = false;
var apos = form.emailAdd.value.indexOf("@");
@@ -183,7 +185,7 @@
if ( document.getElementById( fields[i] ) ) { // Make sure
field exists
// See if the field is empty or equal to the placeholder
if( !$( '#' + fields[i] ).hasClass( 'optional' )
- && ( document.getElementById( fields[i] ).value
== '' || document.getElementById( fields[i] ).value == mw.msg(
'donate_interface-donor-'+fields[i] ) ) ) {
+ && ( !document.getElementById( fields[i]
).value.trim() || document.getElementById( fields[i] ).value == mw.msg(
'donate_interface-donor-'+fields[i] ) ) ) {
currField = mw.msg(
'donate_interface-error-msg-' + fields[i] );
output += mw.msg(
'donate_interface-error-msg-js' ) + ' ' + currField + '.\r\n';
}
@@ -193,24 +195,24 @@
var stateField = document.getElementById( 'state' );
if ( stateField && stateField.type == 'select-one' ) { // state is a
dropdown select
var selectedState =
stateField.options[stateField.selectedIndex].value;
- if ( selectedState == 'YY' || selectedState == '' ) {
+ if ( selectedState == 'YY' || !selectedState.trim() ) {
output += mw.msg( 'donate_interface-error-msg-js' ) + '
' + mw.msg( 'donate_interface-state-province' ) + '.\r\n';
}
}
var countryField = document.getElementById( 'country' );
if ( countryField && countryField.type == 'select-one' ) { // country
is a dropdown select
- if ( countryField.options[countryField.selectedIndex].value ==
'' ) {
+ if (
!countryField.options[countryField.selectedIndex].value.trim() ) {
output += mw.msg( 'donate_interface-error-msg-js' ) + '
' + mw.msg( 'donate_interface-error-msg-country' ) + '.\r\n';
}
} else { // country is a hidden or text input
- if ( countryField.value == '' ) {
+ if ( !countryField.value.trim() ) {
output += mw.msg( 'donate_interface-error-msg-js' ) + '
' + mw.msg( 'donate_interface-error-msg-country' ) + '.\r\n';
}
}
// validate email address
- if( document.getElementById( 'emailAdd' ).value != '' &&
document.getElementById( 'emailAdd' ).value != mw.msg(
'donate_interface-donor-emailAdd' ) ) {
+ if( document.getElementById( 'emailAdd' ).value.trim() &&
document.getElementById( 'emailAdd' ).value != mw.msg(
'donate_interface-donor-emailAdd' ) ) {
var apos = form.emailAdd.value.indexOf("@");
var dotpos = form.emailAdd.value.lastIndexOf(".");
--
To view, visit https://gerrit.wikimedia.org/r/91310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I768f014a8fb2a46952e0be91b3b974dc2def6a05
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Adamw <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
