Changeset 3745238

Timestamp:

10/14/2026 03:55:59 AM (10 days ago)

Author:

torigoedesign

Message:

Update trunk to 0.9.2

Location:

kakunin-modal-for-contact-form-7/trunk

Files:

• assets/js/kakunin-modal-for-contact-form-7.js (modified) (7 diffs)
• kakunin-modal-for-contact-form-7.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

kakunin-modal-for-contact-form-7/trunk/assets/js/kakunin-modal-for-contact-form-7.js

@@ -351 +351 @@
         field.name.startsWith('_wpcf7') ||
         !field.name ||
+        // quiz / captchar は CF7 がメールに含めない項目なので表示しない
+        field.classList.contains('wpcf7-quiz') ||
+        field.classList.contains('wpcf7-captchar') ||
         this.isFieldInHiddenGroup(field)
       ) {
@@ -379 +382 @@
       // セレクトボックス
       else if (field.tagName === 'SELECT') {
-        const selectedOption = field.options[field.selectedIndex];
-        if (selectedOption) {
-          value = selectedOption.value; // まずvalueを取得
-          // valueが空の場合はスキップ
-          if (!value || value === '') {
-            return;
-          }
-          // 表示用にtextを使用
-          value = selectedOption.text;
-        }
+        // 複数選択にも対応。空値（include_blank / first_as_label の先頭項目）は除く
+        value = Array.from(field.selectedOptions)
+          .filter((option) => option.value !== '')
+          .map((option) => option.text)
+          .join(', ');
+      }
+      // ファイル（field.value は C:\fakepath\ 付きになるためファイル名を使う）
+      else if (field.type === 'file') {
+        value = Array.from(field.files).map((file) => file.name).join(', ');
       }
       // テキストエリア・テキストボックス
@@ -436 +438 @@
     const item = field.closest('.wpcf7-list-item');
     const label = item ? item.querySelector('.wpcf7-list-item-label') : null;
-    return label ? label.textContent.trim() : field.value;
+    const text = label ? label.textContent.trim() : field.value;
+    // free_text オプションの自由記述欄。チェック済みで入力があれば CF7 のメールと同じ「文言 自由記述」の形にする
+    const freeText = item ? item.querySelector('input.wpcf7-free-text') : null;
+    if (freeText && field.checked && freeText.value.trim()) {
+      return `${text} ${freeText.value.trim()}`;
+    }
+    return text;
   }
 
@@ -579 +587 @@
     }
 
-    // 7. name属性から取得（最終手段）
-    return field.name || '';
+    // 7. name属性から取得（最終手段）。checkbox 等の末尾の [] は外す
+    return (field.name || '').replace(/\[\]$/, '');
   }
 
@@ -624 +632 @@
    */
   validateRequiredFields() {
-    // CF7必須フィールド（wpcf7-validates-as-required）の空チェック
+    // CF7必須フィールドの空チェック
+    // - `*` 付きのタグには wpcf7-validates-as-required が付く
+    // - radio / quiz / captchar は `*` が無くても CF7 側で常に必須扱いなので対象に含める
     // CF7 Conditional Fieldsで非表示のグループ内のフィールドはスキップ
-    const requiredFields = this.form.querySelectorAll('.wpcf7-validates-as-required');
+    const requiredFields = this.form.querySelectorAll(
+      '.wpcf7-validates-as-required, .wpcf7-form-control.wpcf7-radio, .wpcf7-quiz, .wpcf7-captchar'
+    );
     for (const field of requiredFields) {
       if (this.isFieldInHiddenGroup(field)) continue;
-      // [checkbox*] は必須クラスが各 input ではなく
-      // <span class="wpcf7-form-control wpcf7-checkbox"> ラッパーに付くため、中の input の選択状態で判定する
-      if (field.classList.contains('wpcf7-checkbox')) {
+      // [checkbox*] と [radio] は必須クラスが各 input ではなく
+      // <span class="wpcf7-form-control wpcf7-checkbox|wpcf7-radio"> ラッパーに付くため、中の input の選択状態で判定する
+      if (field.classList.contains('wpcf7-checkbox') || field.classList.contains('wpcf7-radio')) {
         if (!field.querySelector('input:checked')) return false;
         continue;
@@ -639 +651 @@
         const checked = this.form.querySelector(`input[name="${name}"]:checked`);
         if (!checked) return false;
+      } else if (field.tagName === 'SELECT') {
+        // multiple + include_blank で空欄と値を同時に選ぶと select.value は空欄を返すため、
+        // CF7 と同じく空値を除いた上で選択があるかで判定する
+        if (!Array.from(field.selectedOptions).some((option) => option.value.trim() !== '')) return false;
       } else {
         if (!field.value || field.value.trim() === '') return false;
@@ -644 +660 @@
     }
 
-    // CF7 acceptanceフィールド（未チェックの必須acceptance）
-    const uncheckedAcceptance = this.form.querySelectorAll('.wpcf7-acceptance:not(.optional) input[type="checkbox"]:not(:checked)');
-    if (uncheckedAcceptance.length > 0) return false;
+    // CF7 acceptance（optional 以外）。invert 付きは「チェックしていない状態」が同意
+    const acceptances = this.form.querySelectorAll('.wpcf7-acceptance:not(.optional)');
+    for (const acceptance of acceptances) {
+      if (this.isFieldInHiddenGroup(acceptance)) continue;
+      const checkbox = acceptance.querySelector('input[type="checkbox"]');
+      if (checkbox && checkbox.checked === acceptance.classList.contains('invert')) return false;
+    }
 
     return true;

kakunin-modal-for-contact-form-7/trunk/kakunin-modal-for-contact-form-7.php

@@ -5 +5 @@
  * Plugin URI: https://torigoedesign.com/kakunin-modal-for-contact-form-7/
  * Description: Adds a confirmation modal to Contact Form 7 forms so visitors can review their input before the form is submitted.
- * Version: 0.9.1
+ * Version: 0.9.2
  * Requires at least: 5.0
  * Requires PHP: 7.4
@@ -34 +34 @@
 
 // プラグインのバージョン
-define('CF7_CONFIRM_VERSION', '0.9.1');
+define('CF7_CONFIRM_VERSION', '0.9.2');
 
 // プラグインのスラッグ（テキストドメイン・スクリプトハンドル・設定ページのslugに共通で使用）

kakunin-modal-for-contact-form-7/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 7.1
 Requires PHP: 7.4
-Stable tag: 0.9.1
+Stable tag: 0.9.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -93 +93 @@
 == Changelog ==
 
+= 0.9.2 =
+* Radio buttons, quiz and CAPTCHA (`[captchar]`) fields are now treated as required, matching Contact Form 7. The submit button stays disabled until an option is selected or the field is filled in.
+* Acceptance checkboxes with the `invert` option now work. The form can be submitted while the box is unchecked. Acceptance checkboxes inside a hidden group of the Conditional Fields plugin are ignored.
+* Multiple-select fields now show every selected option in the modal, separated by commas. A required multiple select with `include_blank` now accepts the blank option selected together with another option. A select with no option chosen is shown as empty when empty fields are set to be displayed.
+* File fields now show only the file name in the modal, without the `C:\fakepath\` prefix added by the browser.
+* The free text of checkbox and radio options with `free_text` is now shown next to the option label, in the same form as the email Contact Form 7 sends. Quiz and CAPTCHA answers are no longer shown in the modal.
+* When a field label falls back to the name attribute, the trailing `[]` is removed.
+
 = 0.9.1 =
 * Fixed the submit button staying disabled on forms with a required checkbox field (`[checkbox*]`). Contact Form 7 puts the required class on the wrapper of the options, so the wrapper is now checked for a selected option.