= 2.1.3 (2022-04-18) =

* check for user_cap 'wpcf7_edit_contact_forms' instead of 'wpcf7_edit_contact_form' in several places. Thanks, [@PayBox](https://wordpress.org/support/topic/some-notices-appearing-fix-suggested/)! * PRO multistep: make "Next step" and "Previous step" buttons translatable by third party plugins like wpml and loco translate. * PRO multistep: show spinner while validating a step. * PRO Fix additional disable_on_hide bug with multistep [GH issue 87-4](#87) * Replace all occurences of text domain 'contact-form-7' with 'cf7-conditional-fields'
pwkip · Apr 18, 2022 · 5b3cb5c · 5b3cb5c
1 parent 4e7496a
commit 5b3cb5c
Show file tree

Hide file tree

Showing 15 changed files with 65 additions and 50 deletions.
diff --git a/Wpcf7cfMailParser.php b/Wpcf7cfMailParser.php
@@ -30,6 +30,7 @@ function hide_hidden_mail_fields_regex_callback ( $matches ) {
         $name_suffix = implode('__',$name_parts);
 
 		$content = $matches[2];
+
 		if ( in_array( $name, $this->hidden_groups ) ) {
 
 		    // The tag name represents a hidden group, so replace everything from [tagname] to [/tagname] with nothing

diff --git a/admin-style.css b/admin-style.css
@@ -69,6 +69,7 @@
     box-shadow: none;
     height: 22px;
     line-height: 22px;
+    min-height: 22px;
     box-sizing: content-box; }
   #wpcf7cf-conditional-panel #wpcf7cf-entries .label {
     background-color: transparent;
@@ -116,7 +117,7 @@
     height: 22px;
     position: absolute;
     line-height: 22px;
-    right: 50px;
+    right: 53px;
     top: 0; }
   #wpcf7cf-conditional-panel .wpcf7cf-and-rule {
     margin-bottom: 4px;
@@ -137,7 +138,7 @@
     box-sizing: border-box;
     display: flex; }
   #wpcf7cf-conditional-panel .entry .wpcf7cf-if {
-    width: 188px; }
+    width: 189px; }
   #wpcf7cf-conditional-panel .then-field-select {
     width: 130px; }
   #wpcf7cf-conditional-panel .entry .wpcf7cf-and-rules {

diff --git a/admin-style.scss b/admin-style.scss
@@ -88,6 +88,7 @@
         box-shadow: none;
         height: 22px;
         line-height: 22px;
+        min-height: 22px;
         box-sizing: content-box;
     }
 
@@ -147,7 +148,7 @@
         height: 22px;
         position: absolute;
         line-height: 22px;
-        right: 50px;
+        right: 53px;
         top: 0;
     }
 
@@ -184,7 +185,7 @@
     }
 
     .entry .wpcf7cf-if {
-        width: 188px;
+        width: 189px;
     }
 
     .then-field-select {

diff --git a/admin.php b/admin.php
@@ -19,7 +19,7 @@ function wpcf7cf_admin_enqueue_scripts( $hook_suffix ) {
 add_filter('wpcf7_editor_panels', 'add_conditional_panel');
 
 function add_conditional_panel($panels) {
-	if ( current_user_can( 'wpcf7_edit_contact_form' ) ) {
+	if ( current_user_can( 'wpcf7_edit_contact_forms' ) ) {
 		$panels['wpcf7cf-conditional-panel'] = array(
 			'title'    => __( 'Conditional fields', 'cf7-conditional-fields' ),
 			'callback' => 'wpcf7cf_editor_panel_conditional'
@@ -113,9 +113,6 @@ function wpcf7cf_editor_panel_conditional($form) {
 			print_entries_html($form);
 			?>
 			<div id="wpcf7cf-entries">
-				<?php
-				//print_entries_html($form, $wpcf7cf_entries);
-				?>
 			</div>
 
 			<span id="wpcf7cf-add-button" title="<?php _e( 'add new rule', 'cf7-conditional-fields' ); ?>"><?php _e( '+ add new conditional rule', 'cf7-conditional-fields'); ?></span>

diff --git a/cf7cf.php b/cf7cf.php
@@ -447,9 +447,9 @@ function wpcf7cf_form_hidden_fields($hidden_fields) {
     unset($options['settings']['license_key']); // don't show license key in the source code duh.
 
 	return array_merge($hidden_fields, array(
-        '_wpcf7cf_hidden_group_fields' => '',
-        '_wpcf7cf_hidden_groups' => '',
-        '_wpcf7cf_visible_groups' => '',
+        '_wpcf7cf_hidden_group_fields' => '[]',
+        '_wpcf7cf_hidden_groups' => '[]',
+        '_wpcf7cf_visible_groups' => '[]',
         '_wpcf7cf_repeaters' => '[]',
         '_wpcf7cf_steps' => '{}',
         '_wpcf7cf_options' => ''.json_encode($options),

diff --git a/contact-form-7-conditional-fields.php b/contact-form-7-conditional-fields.php
@@ -4,7 +4,7 @@
 * Plugin URI: http://bdwm.be/
 * Description: Adds support for conditional fields to Contact Form 7. This plugin depends on Contact Form 7.
 * Author: Jules Colle
-* Version: 2.1.2
+* Version: 2.1.3
 * Author URI: http://bdwm.be/
 * Text Domain: cf7-conditional-fields
 * License: GPL v2 or later

diff --git a/init.php b/init.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('WPCF7CF_VERSION')) define( 'WPCF7CF_VERSION', '2.1.2' );
+if (!defined('WPCF7CF_VERSION')) define( 'WPCF7CF_VERSION', '2.1.3' );
 if (!defined('WPCF7CF_CF7_MIN_VERSION')) define( 'WPCF7CF_CF7_MIN_VERSION', '5.4' );
 if (!defined('WPCF7CF_CF7_MAX_VERSION')) define( 'WPCF7CF_CF7_MAX_VERSION', '5.5.6' );
 if (!defined('WPCF7CF_REQUIRED_WP_VERSION')) define( 'WPCF7CF_REQUIRED_WP_VERSION', '4.1' );

diff --git a/js/scripts.js b/js/scripts.js
diff --git a/js/scripts.js.map b/js/scripts.js.map
diff --git a/js/scripts_es6.js b/js/scripts_es6.js
@@ -472,6 +472,7 @@ Wpcf7cfForm.prototype.updateEventListeners = function() {
         var form = e.data;
         clearTimeout(wpcf7cf_timeout);
         wpcf7cf_timeout = setTimeout(function() {
+            window.wpcf7cf.updateMultistepState(form.multistep);
             form.displayFields();
         }, wpcf7cf_change_time_ms);
     });
@@ -886,8 +887,10 @@ function Wpcf7cfMultistep($multistep, form) {
     multistep.$btn_next.on('click.wpcf7cf_step', async function() {
 
         multistep.$btn_next.addClass('disabled').attr('disabled', true);
-
+        multistep.form.$form.addClass('submitting');
         var result = await multistep.validateStep(multistep.currentStep);
+        multistep.form.$form.removeClass('submitting');
+
         if (result === 'success') {
             multistep.moveToStep(multistep.currentStep+1); 
         }
@@ -1201,8 +1204,6 @@ window.wpcf7cf = {
 
             const val = type === 'step' ? [currentNode.dataset.id.substring(5)] : [];
 
-            const parentGroup = 'parent-group';
-
             const suffix = nameWithoutBrackets.replace(originalNameWithoutBrackets, '');
 
             if (!simplified_dom[name]) {
@@ -1256,12 +1257,14 @@ window.wpcf7cf = {
 
         // replace next button with submit button on last step.
         // TODO: make this depend on a setting
-        var $submit_button = multistep.form.$form.find('input[type="submit"]').eq(0);
-        var $ajax_loader = multistep.form.$form.find('.ajax-loader').eq(0);
+        var $submit_button = multistep.form.$form.find('input[type="submit"]:last').eq(0);
+        var $ajax_loader = multistep.form.$form.find('.wpcf7-spinner').eq(0);
+
+        $submit_button.detach().prependTo(multistep.$btn_next.parent());
+        $ajax_loader.detach().prependTo(multistep.$btn_next.parent());
+
         if (multistep.currentStep == multistep.numSteps) {
             multistep.$btn_next.hide();
-            $ajax_loader.detach().appendTo(multistep.$btn_next.parent());
-            $submit_button.detach().appendTo(multistep.$btn_next.parent());
             $submit_button.show();
         } else {
             $submit_button.hide();

diff --git a/jsdoc-out/index.html b/jsdoc-out/index.html
@@ -56,7 +56,7 @@ <h2><a href="index.html">Home</a></h2><h3>Namespaces</h3><ul><li><a href="wpcf7c
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.5</a> on Wed Feb 23 2022 11:10:35 GMT+0100 (Midden-Europese standaardtijd)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.5</a> on Mon Apr 18 2022 23:26:26 GMT+0200 (Midden-Europese zomertijd)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/jsdoc-out/scripts_es6.js.html b/jsdoc-out/scripts_es6.js.html
@@ -500,6 +500,7 @@ <h1 class="page-title">Source: scripts_es6.js</h1>
         var form = e.data;
         clearTimeout(wpcf7cf_timeout);
         wpcf7cf_timeout = setTimeout(function() {
+            window.wpcf7cf.updateMultistepState(form.multistep);
             form.displayFields();
         }, wpcf7cf_change_time_ms);
     });
@@ -914,8 +915,10 @@ <h1 class="page-title">Source: scripts_es6.js</h1>
     multistep.$btn_next.on('click.wpcf7cf_step', async function() {
 
         multistep.$btn_next.addClass('disabled').attr('disabled', true);
-
+        multistep.form.$form.addClass('submitting');
         var result = await multistep.validateStep(multistep.currentStep);
+        multistep.form.$form.removeClass('submitting');
+
         if (result === 'success') {
             multistep.moveToStep(multistep.currentStep+1); 
         }
@@ -1229,8 +1232,6 @@ <h1 class="page-title">Source: scripts_es6.js</h1>
 
             const val = type === 'step' ? [currentNode.dataset.id.substring(5)] : [];
 
-            const parentGroup = 'parent-group';
-
             const suffix = nameWithoutBrackets.replace(originalNameWithoutBrackets, '');
 
             if (!simplified_dom[name]) {
@@ -1284,12 +1285,14 @@ <h1 class="page-title">Source: scripts_es6.js</h1>
 
         // replace next button with submit button on last step.
         // TODO: make this depend on a setting
-        var $submit_button = multistep.form.$form.find('input[type="submit"]').eq(0);
-        var $ajax_loader = multistep.form.$form.find('.ajax-loader').eq(0);
+        var $submit_button = multistep.form.$form.find('input[type="submit"]:last').eq(0);
+        var $ajax_loader = multistep.form.$form.find('.wpcf7-spinner').eq(0);
+
+        $submit_button.detach().prependTo(multistep.$btn_next.parent());
+        $ajax_loader.detach().prependTo(multistep.$btn_next.parent());
+
         if (multistep.currentStep == multistep.numSteps) {
             multistep.$btn_next.hide();
-            $ajax_loader.detach().appendTo(multistep.$btn_next.parent());
-            $submit_button.detach().appendTo(multistep.$btn_next.parent());
             $submit_button.show();
         } else {
             $submit_button.hide();
@@ -1584,7 +1587,7 @@ <h2><a href="index.html">Home</a></h2><h3>Namespaces</h3><ul><li><a href="wpcf7c
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.5</a> on Wed Feb 23 2022 11:10:35 GMT+0100 (Midden-Europese standaardtijd)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.5</a> on Mon Apr 18 2022 23:26:26 GMT+0200 (Midden-Europese zomertijd)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/jsdoc-out/wpcf7cf.html b/jsdoc-out/wpcf7cf.html
@@ -70,7 +70,7 @@ <h2>wpcf7cf</h2>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1051">line 1051</a>
+        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1054">line 1054</a>
     </li></ul></dd>
 
 
@@ -236,7 +236,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1501">line 1501</a>
+        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1504">line 1504</a>
     </li></ul></dd>
 
 
@@ -399,7 +399,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1512">line 1512</a>
+        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1515">line 1515</a>
     </li></ul></dd>
 
 
@@ -562,7 +562,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1433">line 1433</a>
+        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1436">line 1436</a>
     </li></ul></dd>
 
 
@@ -748,7 +748,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1453">line 1453</a>
+        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1456">line 1456</a>
     </li></ul></dd>
 
 
@@ -934,7 +934,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1477">line 1477</a>
+        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1480">line 1480</a>
     </li></ul></dd>
 
 
@@ -1120,7 +1120,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1465">line 1465</a>
+        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1468">line 1468</a>
     </li></ul></dd>
 
 
@@ -1307,7 +1307,7 @@ <h5>Parameters:</h5>
 
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1490">line 1490</a>
+        <a href="scripts_es6.js.html">scripts_es6.js</a>, <a href="scripts_es6.js.html#line1493">line 1493</a>
     </li></ul></dd>
 
 
@@ -1359,7 +1359,7 @@ <h2><a href="index.html">Home</a></h2><h3>Namespaces</h3><ul><li><a href="wpcf7c
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.5</a> on Wed Feb 23 2022 11:10:36 GMT+0100 (Midden-Europese standaardtijd)
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.5</a> on Mon Apr 18 2022 23:26:26 GMT+0200 (Midden-Europese zomertijd)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/readme.txt b/readme.txt
@@ -5,8 +5,8 @@ Author: Jules Colle
 Website: http://bdwm.be
 Tags: wordpress, contact form 7, forms, conditional fields
 Requires at least: 5.0
-Tested up to: 5.9
-Stable tag: 2.1.2
+Tested up to: 5.9.3
+Stable tag: 2.1.3
 Requires PHP: 7.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -123,6 +123,13 @@ Make sure to also update CF7 to the latest version! (Version 2.0 is only compati
 
 == Changelog ==
 
+= 2.1.3 (2022-04-18) =
+* check for user_cap 'wpcf7_edit_contact_forms' instead of 'wpcf7_edit_contact_form' in several places. Thanks, [@paybox](https://wordpress.org/support/topic/some-notices-appearing-fix-suggested/)!
+* PRO multistep: make "Next step" and "Previous step" buttons translatable by third party plugins like wpml and loco translate.
+* PRO multistep: show spinner while validating a step.
+* PRO Fix additional disable_on_hide bug with multistep [GH issue 87-4](https://github.com/pwkip/contact-form-7-conditional-fields/issues/87)
+* Replace all occurences of text domain 'contact-form-7' with 'cf7-conditional-fields'
+
 = 2.1.2 (2022-02-23) =
 * Fully tested with Contact Form 7 version 5.5.6
 

diff --git a/wpcf7cf-options.php b/wpcf7cf-options.php
@@ -275,7 +275,7 @@ function wpcf7cf_input_select($slug, $args) {
 add_action('admin_init', 'wpcf7cf_admin_init');
 function wpcf7cf_admin_init(){
 
-    if(isset($_POST['reset']) && current_user_can( 'wpcf7_edit_contact_form' ) ) {
+    if(isset($_POST['reset']) && current_user_can( 'wpcf7_edit_contact_forms' ) ) {
         wpcf7cf_reset_options();
     }