Merge pull request #502 from WebDevStudios/sprint/20.06-2

Release sprint/20.06-2 to master

CHANGELOG.md

@@ -1,3 +1,8 @@
+= 1.8.7 =
+* Improved: Implemented recommendations for improved accessibility.
+* Improved: Avoid duplicate ID attributes when more than one form is present on a page.
+* Fixed: Submit button targeting for recaptcha v2.
+
 = 1.8.6 =
 * Fixed: Removed invalid property being sent to the API, causing rejected requests.
 * Fixed: Failure to log API errors for support purposes.

assets/js/ctct-plugin-frontend/util.js

@@ -8,7 +8,7 @@
 	 */
 	$( document ).ready( () => {
 
-		$( '#ctct-submitted' ).on( 'click', () => {
+		$( '.ctct-submitted' ).on( 'click', () => {
 			setTimeout( () => {
 				disableSendButton();
 				setTimeout( enableSendButton, 3000 );
@@ -25,7 +25,7 @@
 	 * @return {mixed} jQuery if attribute is set, undefined if not.
 	 */
 	function disableSendButton() {
-		return $( '#ctct-submitted' ).attr( 'disabled', 'disabled' );
+		return $( '.ctct-submitted' ).attr( 'disabled', 'disabled' );
 	}
 
 	/**
@@ -37,7 +37,7 @@
 	 * @return {mixed} jQuery if attribute is set, undefined if not.
 	 */
 	function enableSendButton() {
-		return $( '#ctct-submitted' ).attr( 'disabled', null );
+		return $( '.ctct-submitted' ).attr( 'disabled', null );
 	}
 
 } ( window, jQuery ) );

assets/js/ctct-plugin-frontend/validation.js

@@ -56,7 +56,7 @@
 
 			var $form = $( form );
 
-			app.$c.$forms[ i ].$honeypot     = $form.find( '#ctct_usage_field' );
+			app.$c.$forms[ i ].$honeypot     = $form.find( '.ctct_usage_field' );
 			app.$c.$forms[ i ].$submitButton = $form.find( 'input[type=submit]' );
 			app.$c.$forms[ i ].$recaptcha    = $form.find( '.g-recaptcha' );
 		} );
@@ -146,15 +146,26 @@
 	 * @param {string} message The message content.
 	 * @param {string} classes Optional. HTML classes to add to the message wrapper.
 	 */
-	app.showMessage = ( $form, message, classes = '' ) => {
+	app.showMessage = ( $form, message, classes = '', role = 'log' ) => {
+
+		const $wrapper = $form.parents( '.ctct-form-wrapper' );
+
+		$wrapper.find( 'p.ctct-message' ).remove();
 
 		var $p = $( '<p />', {
 			'class': 'ctct-message ' + classes,
-			'text': message
-		} );
-
-		$p.insertBefore( $form ).fadeIn( 200 ).delay( 5000 ).slideUp( 200, () => {
-			$p.remove();
+			'text': message,
+			'role': role
+		} ).prepend( $( '<button />', {
+			'class': 'button button-secondary ctct-dismiss ctct-dismiss-ajax-notice',
+			'html': '&#10005;',
+			'aria-label': 'Dismiss Notification'
+		} ) );
+
+		$p.insertBefore( $form ).fadeIn( 200 );
+
+		$wrapper.find( '.ctct-dismiss-ajax-notice' ).on( 'click', function() {
+			$( this ).parents( '.ctct-message' ).remove();
 		} );
 	};
 
@@ -168,7 +179,7 @@
 	 */
 	app.submitForm = ( $form ) => {
 
-		$form.find( '#ctct-submitted' ).prop( 'disabled', true );
+		$form.find( '.ctct-submitted' ).prop( 'disabled', true );
 
 		var ajaxData = {
 			'action': 'ctct_process_form',
@@ -177,7 +188,7 @@
 
 		$.post( window.ajaxurl, ajaxData, ( response ) => {
 
-			$form.find( '#ctct-submitted' ).prop( 'disabled', false );
+			$form.find( '.ctct-submitted' ).prop( 'disabled', false );
 
 			if ( 'undefined' === typeof( response.status ) ) {
 				return false;
@@ -190,14 +201,14 @@
 					app.setAllInputsValid();
 					response.errors.forEach( app.processError );
 				} else {
-					app.showMessage( $form, response.message, 'ctct-error' );
+					app.showMessage( $form, response.message, 'ctct-error', 'alert' );
 				}
 
 				return false;
 			}
 
 			// If we're here, the submission was a success; show message and reset form fields.
-			app.showMessage( $form, response.message, 'ctct-success' );
+			app.showMessage( $form, response.message, 'ctct-success', 'status' );
 			$form[0].reset();
 		} );
 	};

assets/js/ctct-plugin-recaptcha-v2.js

@@ -81,7 +81,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 5);
+/******/ 	return __webpack_require__(__webpack_require__.s = 4);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -105,11 +105,11 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _rec
 /*! no static exports found */
 /***/ (function(module, exports) {
 
-eval("var ctctEnableBtn = function ctctEnableBtn(index) {\n  jQuery(jQuery(\".ctct-submit\")[index]).attr(\"disabled\", false);\n};\n\nwindow.ctctEnableBtn = ctctEnableBtn;\n\nvar ctctDisableBtn = function ctctDisableBtn(index) {\n  jQuery(jQuery(\".ctct-submit\")[index]).attr(\"disabled\", \"disabled\");\n};\n\nwindow.ctctDisableBtn = ctctDisableBtn;\n\nvar renderReCaptcha = function renderReCaptcha() {\n  jQuery('.g-recaptcha').each(function (index, el) {\n    grecaptcha.render(el, {\n      'sitekey': jQuery(el).attr('data-sitekey'),\n      'size': jQuery(el).attr('data-size'),\n      'tabindex': jQuery(el).attr('data-tabindex'),\n      'callback': function callback() {\n        window.ctctEnableBtn(index);\n      },\n      'expired-callback': function expiredCallback() {\n        window.ctctDisableBtn(index);\n      },\n      'isolated': true\n    });\n  });\n};\n\nwindow.renderReCaptcha = renderReCaptcha;//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiLi9hc3NldHMvanMvY3RjdC1wbHVnaW4tcmVjYXB0Y2hhLXYyL3JlY2FwdGNoYS5qcy5qcyIsInNvdXJjZXMiOlsid2VicGFjazovLy8uL2Fzc2V0cy9qcy9jdGN0LXBsdWdpbi1yZWNhcHRjaGEtdjIvcmVjYXB0Y2hhLmpzPzlhNDQiXSwic291cmNlc0NvbnRlbnQiOlsidmFyIGN0Y3RFbmFibGVCdG4gPSBmdW5jdGlvbiggaW5kZXggKSB7XG4gICAgalF1ZXJ5KCBqUXVlcnkoIFwiLmN0Y3Qtc3VibWl0XCIgKVsgaW5kZXggXSApLmF0dHIoIFwiZGlzYWJsZWRcIiwgZmFsc2UgKTtcbn1cbndpbmRvdy5jdGN0RW5hYmxlQnRuID0gY3RjdEVuYWJsZUJ0bjtcblxudmFyIGN0Y3REaXNhYmxlQnRuID0gZnVuY3Rpb24oIGluZGV4ICkge1xuICAgIGpRdWVyeSggalF1ZXJ5KCBcIi5jdGN0LXN1Ym1pdFwiIClbIGluZGV4IF0gKS5hdHRyKCBcImRpc2FibGVkXCIsIFwiZGlzYWJsZWRcIiApO1xufVxud2luZG93LmN0Y3REaXNhYmxlQnRuID0gY3RjdERpc2FibGVCdG47XG5cbnZhciByZW5kZXJSZUNhcHRjaGEgPSBmdW5jdGlvbigpIHtcbiAgICBqUXVlcnkoICcuZy1yZWNhcHRjaGEnICkuZWFjaCggZnVuY3Rpb24oIGluZGV4LCBlbCApIHtcbiAgICAgICAgZ3JlY2FwdGNoYS5yZW5kZXIoIGVsLCB7XG4gICAgICAgICAgICAnc2l0ZWtleSc6IGpRdWVyeSggZWwgKS5hdHRyKCAnZGF0YS1zaXRla2V5JyApLFxuICAgICAgICAgICAgJ3NpemUnOiBqUXVlcnkoIGVsICkuYXR0ciggJ2RhdGEtc2l6ZScgKSxcbiAgICAgICAgICAgICd0YWJpbmRleCc6IGpRdWVyeSggZWwgKS5hdHRyKCAnZGF0YS10YWJpbmRleCcgKSxcbiAgICAgICAgICAgICdjYWxsYmFjayc6IGZ1bmN0aW9uKCkge1xuICAgICAgICAgICAgICAgIHdpbmRvdy5jdGN0RW5hYmxlQnRuKCBpbmRleCApO1xuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgICdleHBpcmVkLWNhbGxiYWNrJzogZnVuY3Rpb24oKSB7XG4gICAgICAgICAgICAgICAgd2luZG93LmN0Y3REaXNhYmxlQnRuKCBpbmRleCApO1xuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgICdpc29sYXRlZCc6IHRydWUsXG4gICAgICAgIH0gKTtcbiAgICB9ICk7XG59O1xud2luZG93LnJlbmRlclJlQ2FwdGNoYSA9IHJlbmRlclJlQ2FwdGNoYTtcbiJdLCJtYXBwaW5ncyI6IkFBQUE7QUFDQTtBQUNBO0FBQ0E7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFBQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFWQTtBQVlBO0FBQ0E7QUFDQTtBQUFBIiwic291cmNlUm9vdCI6IiJ9\n//# sourceURL=webpack-internal:///./assets/js/ctct-plugin-recaptcha-v2/recaptcha.js\n");
+eval("/**\n * Enable submit button.\n *\n * @author Rebekah Van Epps <[email protected]>\n * @since  1.8.3\n *\n * @param  {Object} submitBtn Submit DOM element.\n */\nvar ctctEnableBtn = function ctctEnableBtn(submitBtn) {\n  jQuery(submitBtn).attr(\"disabled\", false);\n};\n\nwindow.ctctEnableBtn = ctctEnableBtn;\n/**\n * Disable submit button.\n *\n * @author Rebekah Van Epps <[email protected]>\n * @since  1.8.3\n *\n * @param  {Object} submitBtn Submit DOM element.\n */\n\nvar ctctDisableBtn = function ctctDisableBtn(submitBtn) {\n  jQuery(submitBtn).attr(\"disabled\", \"disabled\");\n};\n\nwindow.ctctDisableBtn = ctctDisableBtn;\n\nvar renderReCaptcha = function renderReCaptcha() {\n  jQuery('.g-recaptcha').each(function (index, el) {\n    var submitBtn = jQuery(el).siblings('.ctct-form-field-submit').find('.ctct-submit');\n    grecaptcha.render(el, {\n      'sitekey': jQuery(el).attr('data-sitekey'),\n      'size': jQuery(el).attr('data-size'),\n      'tabindex': jQuery(el).attr('data-tabindex'),\n      'callback': function callback() {\n        window.ctctEnableBtn(submitBtn);\n      },\n      'expired-callback': function expiredCallback() {\n        window.ctctDisableBtn(submitBtn);\n      },\n      'isolated': true\n    });\n  });\n};\n\nwindow.renderReCaptcha = renderReCaptcha;//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiLi9hc3NldHMvanMvY3RjdC1wbHVnaW4tcmVjYXB0Y2hhLXYyL3JlY2FwdGNoYS5qcy5qcyIsInNvdXJjZXMiOlsid2VicGFjazovLy8uL2Fzc2V0cy9qcy9jdGN0LXBsdWdpbi1yZWNhcHRjaGEtdjIvcmVjYXB0Y2hhLmpzPzlhNDQiXSwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBFbmFibGUgc3VibWl0IGJ1dHRvbi5cbiAqXG4gKiBAYXV0aG9yIFJlYmVrYWggVmFuIEVwcHMgPHJlYmVrYWgudmFuZXBwc0B3ZWJkZXZzdHVkaW9zLmNvbT5cbiAqIEBzaW5jZSAgMS44LjNcbiAqXG4gKiBAcGFyYW0gIHtPYmplY3R9IHN1Ym1pdEJ0biBTdWJtaXQgRE9NIGVsZW1lbnQuXG4gKi9cbnZhciBjdGN0RW5hYmxlQnRuID0gZnVuY3Rpb24oIHN1Ym1pdEJ0biApIHtcbiAgICBqUXVlcnkoIHN1Ym1pdEJ0biApLmF0dHIoIFwiZGlzYWJsZWRcIiwgZmFsc2UgKTtcbn1cbndpbmRvdy5jdGN0RW5hYmxlQnRuID0gY3RjdEVuYWJsZUJ0bjtcblxuLyoqXG4gKiBEaXNhYmxlIHN1Ym1pdCBidXR0b24uXG4gKlxuICogQGF1dGhvciBSZWJla2FoIFZhbiBFcHBzIDxyZWJla2FoLnZhbmVwcHNAd2ViZGV2c3R1ZGlvcy5jb20+XG4gKiBAc2luY2UgIDEuOC4zXG4gKlxuICogQHBhcmFtICB7T2JqZWN0fSBzdWJtaXRCdG4gU3VibWl0IERPTSBlbGVtZW50LlxuICovXG52YXIgY3RjdERpc2FibGVCdG4gPSBmdW5jdGlvbiggc3VibWl0QnRuICkge1xuICAgIGpRdWVyeSggc3VibWl0QnRuICkuYXR0ciggXCJkaXNhYmxlZFwiLCBcImRpc2FibGVkXCIgKTtcbn1cbndpbmRvdy5jdGN0RGlzYWJsZUJ0biA9IGN0Y3REaXNhYmxlQnRuO1xuXG52YXIgcmVuZGVyUmVDYXB0Y2hhID0gZnVuY3Rpb24oKSB7XG4gICAgalF1ZXJ5KCAnLmctcmVjYXB0Y2hhJyApLmVhY2goIGZ1bmN0aW9uKCBpbmRleCwgZWwgKSB7XG4gICAgICAgIGNvbnN0IHN1Ym1pdEJ0biA9IGpRdWVyeSggZWwgKS5zaWJsaW5ncyggJy5jdGN0LWZvcm0tZmllbGQtc3VibWl0JyApLmZpbmQoICcuY3RjdC1zdWJtaXQnICk7XG5cbiAgICAgICAgZ3JlY2FwdGNoYS5yZW5kZXIoIGVsLCB7XG4gICAgICAgICAgICAnc2l0ZWtleSc6IGpRdWVyeSggZWwgKS5hdHRyKCAnZGF0YS1zaXRla2V5JyApLFxuICAgICAgICAgICAgJ3NpemUnOiBqUXVlcnkoIGVsICkuYXR0ciggJ2RhdGEtc2l6ZScgKSxcbiAgICAgICAgICAgICd0YWJpbmRleCc6IGpRdWVyeSggZWwgKS5hdHRyKCAnZGF0YS10YWJpbmRleCcgKSxcbiAgICAgICAgICAgICdjYWxsYmFjayc6IGZ1bmN0aW9uKCkge1xuICAgICAgICAgICAgICAgIHdpbmRvdy5jdGN0RW5hYmxlQnRuKCBzdWJtaXRCdG4gKTtcbiAgICAgICAgICAgIH0sXG4gICAgICAgICAgICAnZXhwaXJlZC1jYWxsYmFjayc6IGZ1bmN0aW9uKCkge1xuICAgICAgICAgICAgICAgIHdpbmRvdy5jdGN0RGlzYWJsZUJ0biggc3VibWl0QnRuICk7XG4gICAgICAgICAgICB9LFxuICAgICAgICAgICAgJ2lzb2xhdGVkJzogdHJ1ZSxcbiAgICAgICAgfSApO1xuICAgIH0gKTtcbn07XG53aW5kb3cucmVuZGVyUmVDYXB0Y2hhID0gcmVuZGVyUmVDYXB0Y2hhO1xuIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7QUFRQTtBQUNBO0FBQ0E7QUFDQTtBQUFBO0FBRUE7Ozs7Ozs7OztBQVFBO0FBQ0E7QUFDQTtBQUNBO0FBQUE7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUVBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFWQTtBQVlBO0FBQ0E7QUFDQTtBQUFBIiwic291cmNlUm9vdCI6IiJ9\n//# sourceURL=webpack-internal:///./assets/js/ctct-plugin-recaptcha-v2/recaptcha.js\n");
 
 /***/ }),
 
-/***/ 5:
+/***/ 4:
 /*!***********************************************************!*\
   !*** multi ./assets/js/ctct-plugin-recaptcha-v2/index.js ***!
   \***********************************************************/

assets/js/ctct-plugin-recaptcha-v2/recaptcha.js

@@ -1,24 +1,42 @@
-var ctctEnableBtn = function( index ) {
-    jQuery( jQuery( ".ctct-submit" )[ index ] ).attr( "disabled", false );
+/**
+ * Enable submit button.
+ *
+ * @author Rebekah Van Epps <[email protected]>
+ * @since  1.8.3
+ *
+ * @param  {Object} submitBtn Submit DOM element.
+ */
+var ctctEnableBtn = function( submitBtn ) {
+    jQuery( submitBtn ).attr( "disabled", false );
 }
 window.ctctEnableBtn = ctctEnableBtn;
 
-var ctctDisableBtn = function( index ) {
-    jQuery( jQuery( ".ctct-submit" )[ index ] ).attr( "disabled", "disabled" );
+/**
+ * Disable submit button.
+ *
+ * @author Rebekah Van Epps <[email protected]>
+ * @since  1.8.3
+ *
+ * @param  {Object} submitBtn Submit DOM element.
+ */
+var ctctDisableBtn = function( submitBtn ) {
+    jQuery( submitBtn ).attr( "disabled", "disabled" );
 }
 window.ctctDisableBtn = ctctDisableBtn;
 
 var renderReCaptcha = function() {
     jQuery( '.g-recaptcha' ).each( function( index, el ) {
+        const submitBtn = jQuery( el ).siblings( '.ctct-form-field-submit' ).find( '.ctct-submit' );
+
         grecaptcha.render( el, {
             'sitekey': jQuery( el ).attr( 'data-sitekey' ),
             'size': jQuery( el ).attr( 'data-size' ),
             'tabindex': jQuery( el ).attr( 'data-tabindex' ),
             'callback': function() {
-                window.ctctEnableBtn( index );
+                window.ctctEnableBtn( submitBtn );
             },
             'expired-callback': function() {
-                window.ctctDisableBtn( index );
+                window.ctctDisableBtn( submitBtn );
             },
             'isolated': true,
         } );

assets/sass/_global.scss

@@ -23,5 +23,13 @@
 			border-color: $color-green;
 			color: darken( $color-success, 20% );
 		}
+
+		.ctct-dismiss-ajax-notice {
+			border-radius: 50%;
+			float: right;
+			line-height: 1;
+			padding: 0.85rem 1rem;
+			text-decoration: none;
+		}
 	}
 }

assets/sass/_inputs.scss

@@ -77,7 +77,7 @@
 		top: -9999px !important;
 	}
 
-	#ctct_usage {
+	.ctct_usage {
 		border: 0 none;
 		clip: rect( 0, 0, 0, 0 );
 		height: 1px;
@@ -88,7 +88,7 @@
 		width: 1px;
 	}
 
-	.no-recaptcha #ctct-submitted:disabled {
+	.no-recaptcha .ctct-submitted:disabled {
 		background-image: url('../images/oval.min.svg');
 		background-position: center;
 		background-repeat: no-repeat;
@@ -97,7 +97,7 @@
 		opacity: 0.3;
 	}
 
-	.has-recaptcha #ctct-submitted:disabled {
+	.has-recaptcha .ctct-submitted:disabled {
 		cursor: not-allowed;
 	}
 }

constant-contact-forms.php

@@ -12,7 +12,7 @@
  * Plugin Name: Constant Contact Forms for WordPress
  * Plugin URI:  https://www.constantcontact.com
  * Description: Be a better marketer. All it takes is Constant Contact email marketing.
- * Version:     1.8.6
+ * Version:     1.8.7
  * Author:      Constant Contact
  * Author URI:  https://www.constantcontact.com/index?pn=miwordpress
  * License:     GPLv3
@@ -72,7 +72,7 @@ class Constant_Contact {
 	 * @since 1.0.0
 	 * @var string
 	 */
-	const VERSION = '1.8.6';
+	const VERSION = '1.8.7';
 
 	/**
 	 * URL of plugin directory.

includes/class-api.php

@@ -509,6 +509,11 @@ public function add_contact( $new_contact = [], $form_id = 0 ) {
 		try {
 			$response = $this->cc()->contactService->getContacts( $api_token, [ 'email' => $email ] );
 
+			// Remove ctct-instance if present to avoid errors.
+			if ( array_key_exists( 'ctct-instance', $new_contact ) ) {
+				unset( $new_contact['ctct-instance'] );
+			}
+
 			if ( isset( $response->results ) && ! empty( $response->results ) ) {
 				constant_contact_maybe_log_it( 'API', 'Contact set to be updated', [ 'form' => get_the_title( $form_id ) ] );
 				$return_contact = $this->update_contact( $response, $api_token, $list, $new_contact, $form_id );