[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Show 'enable cookies' error message
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/392985 ) Change subject: Show 'enable cookies' error message .. Show 'enable cookies' error message Was deleted by mistake Bug: T180975 Change-Id: I05f9967e4397f63633c3d325e6d17cf4de3fbdbe --- M gateway_forms/mustache/index.html.mustache M modules/validate_input.js 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Mepps: Looks good to me, approved jenkins-bot: Verified diff --git a/gateway_forms/mustache/index.html.mustache b/gateway_forms/mustache/index.html.mustache index e27d074..758ab80 100644 --- a/gateway_forms/mustache/index.html.mustache +++ b/gateway_forms/mustache/index.html.mustache @@ -9,6 +9,7 @@ {{> no_script }} {{# errors/general }}{{{ message }}}{{/ errors/general }} + {{# order_id }}{{! Use the full order id as reference if we have one }} {{ l10n "donate_interface-error-reference" . }} diff --git a/modules/validate_input.js b/modules/validate_input.js index 1f48ea3..9bfa8c8 100644 --- a/modules/validate_input.js +++ b/modules/validate_input.js @@ -187,11 +187,10 @@ document.cookie = 'wmf_test=1;'; if ( document.cookie.indexOf( 'wmf_test=1' ) !== -1 ) { document.cookie = 'wmf_test=; expires=Thu, 01-Jan-70 00:00:01 GMT;'; // unset the cookie - $( '#cookieMsg' ).addClass( 'errorMsgHide' ); + clearError( 'cookie' ); } else { errorsPresent = true; // display error - $( '#cookieMsg' ).addClass( 'errorMsg' ); - $( '#cookieMsg' ).text( mediaWiki.msg( 'donate_interface-error-msg-cookies' ) ); + setError( 'cookie', mediaWiki.msg( 'donate_interface-error-msg-cookies' ) ); } return !errorsPresent; -- To view, visit https://gerrit.wikimedia.org/r/392985 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05f9967e4397f63633c3d325e6d17cf4de3fbdbe Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ejegg Gerrit-Reviewer: AndyRussG Gerrit-Reviewer: Mepps Gerrit-Reviewer: XenoRyet Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Show 'enable cookies' error message
Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/392985 ) Change subject: Show 'enable cookies' error message .. Show 'enable cookies' error message Was deleted by mistake Bug: T180975 Change-Id: I05f9967e4397f63633c3d325e6d17cf4de3fbdbe --- M gateway_forms/mustache/index.html.mustache M modules/validate_input.js 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/85/392985/1 diff --git a/gateway_forms/mustache/index.html.mustache b/gateway_forms/mustache/index.html.mustache index e27d074..758ab80 100644 --- a/gateway_forms/mustache/index.html.mustache +++ b/gateway_forms/mustache/index.html.mustache @@ -9,6 +9,7 @@ {{> no_script }} {{# errors/general }}{{{ message }}}{{/ errors/general }} + {{# order_id }}{{! Use the full order id as reference if we have one }} {{ l10n "donate_interface-error-reference" . }} diff --git a/modules/validate_input.js b/modules/validate_input.js index 1f48ea3..9bfa8c8 100644 --- a/modules/validate_input.js +++ b/modules/validate_input.js @@ -187,11 +187,10 @@ document.cookie = 'wmf_test=1;'; if ( document.cookie.indexOf( 'wmf_test=1' ) !== -1 ) { document.cookie = 'wmf_test=; expires=Thu, 01-Jan-70 00:00:01 GMT;'; // unset the cookie - $( '#cookieMsg' ).addClass( 'errorMsgHide' ); + clearError( 'cookie' ); } else { errorsPresent = true; // display error - $( '#cookieMsg' ).addClass( 'errorMsg' ); - $( '#cookieMsg' ).text( mediaWiki.msg( 'donate_interface-error-msg-cookies' ) ); + setError( 'cookie', mediaWiki.msg( 'donate_interface-error-msg-cookies' ) ); } return !errorsPresent; -- To view, visit https://gerrit.wikimedia.org/r/392985 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05f9967e4397f63633c3d325e6d17cf4de3fbdbe Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits