diff --git a/composer.json b/composer.json index 57cbc48..f9bb730 100644 --- a/composer.json +++ b/composer.json @@ -2,5 +2,10 @@ "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "*", "wp-coding-standards/wpcs": "*" + }, + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } } } diff --git a/composer.lock b/composer.lock index f99f709..a1df70d 100644 --- a/composer.lock +++ b/composer.lock @@ -82,12 +82,12 @@ "version": "3.5.8", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", "reference": "9d583721a7157ee997f235f327de038e7ea6dac4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4", "reference": "9d583721a7157ee997f235f327de038e7ea6dac4", "shasum": "" }, @@ -187,10 +187,10 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, - "platform": [], - "platform-dev": [], - "plugin-api-version": "2.0.0" + "platform": {}, + "platform-dev": {}, + "plugin-api-version": "2.6.0" } diff --git a/public/public.js b/public/public.js index ce60d33..3efc49b 100644 --- a/public/public.js +++ b/public/public.js @@ -222,6 +222,7 @@ jQuery(document).ready(function () { // This is a form delay to discourage robots let counter = 5; + let countdown_complete = false; let myInterval = setInterval(function () { let button = jQuery('#submit-button') @@ -230,26 +231,31 @@ jQuery(document).ready(function () { if ( counter === 0 ) { clearInterval(myInterval); - button.html( window.TRANSLATION.submit ).prop('disabled', false) - } + countdown_complete = true; + button.html( window.TRANSLATION.submit ) - // Enforce check to submit requirements - enforce_requires_check_to_submit(); + // Enforce check to submit requirements + enforce_requires_check_to_submit(); + } }, 1000); + // Only enable submit once every "check to submit" checkbox is checked function enforce_requires_check_to_submit() { + if ( !countdown_complete ) { + return; + } + let all_checked = true; jQuery('.input-checkbox').each(function () { - if (jQuery(this).data('selected') === 'check_to_submit') { - jQuery('#submit-button').prop('disabled', true); + if (jQuery(this).data('selected') === 'check_to_submit' && !jQuery(this).prop('checked')) { + all_checked = false; } }); + jQuery('#submit-button').prop('disabled', !all_checked); } - jQuery('.input-checkbox').on('click', function () { - if (jQuery(this).data('selected') === 'check_to_submit') { - jQuery('#submit-button').prop('disabled', !jQuery(this).prop('checked')); - } + jQuery('.input-checkbox').on('change', function () { + enforce_requires_check_to_submit(); }); })