From 1b8665cca165c76963a312d6e9e600dfa016eceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Bell=C3=AAtre?= Date: Wed, 14 Feb 2024 11:47:11 +0100 Subject: [PATCH] Add fifth option to weekdays --- acf-rrule.php | 4 +- assets/js/input.js | 4 +- composer.lock | 63 ++++++++++++++++++-------- include/render.php | 11 +++-- lang/acf-rrule-field-fr_FR.mo | Bin 5018 -> 5250 bytes lang/acf-rrule-field-fr_FR.po | 83 +++++++++++++++++++--------------- lang/acf-rrule-field.pot | 66 ++++++++++++++++++--------- readme.txt | 9 +++- 8 files changed, 151 insertions(+), 89 deletions(-) diff --git a/acf-rrule.php b/acf-rrule.php index 297da96..a8e0ea5 100755 --- a/acf-rrule.php +++ b/acf-rrule.php @@ -4,7 +4,7 @@ Plugin Name: ACF RRule Field Plugin URI: https://github.com/marcbelletre/acf-rrule Description: Create recurring rules with a single ACF field -Version: 1.4.2 +Version: 1.5.0 Author: Marc Bellêtre Author URI: https://pixelparfait.fr License: MIT @@ -44,7 +44,7 @@ public function __construct() // Settings // - these will be passed into the field class. $this->settings = [ - 'version' => '1.4.2', + 'version' => '1.5.0', 'url' => plugin_dir_url(__FILE__), 'path' => plugin_dir_path(__FILE__), ]; diff --git a/assets/js/input.js b/assets/js/input.js index 12e8a6d..cc2c649 100755 --- a/assets/js/input.js +++ b/assets/js/input.js @@ -45,12 +45,12 @@ }); field.$el.find('.monthly-by-options').on('change', 'input[type=radio]', function () { - selectMonthlyBy(($(this))); + selectMonthlyBy($(this)); }); selectFrequency(field.$el.find('.frequency-select')); selectEndType(field.$el.find('.end-type-select')); - selectMonthlyBy(field.$el.find('.monthly-by-options')); + selectMonthlyBy(field.$el.find('.monthly-by-options input[type=radio]:checked')); } if (typeof acf.addAction !== 'undefined') { diff --git a/composer.lock b/composer.lock index f32cd06..dd6d261 100644 --- a/composer.lock +++ b/composer.lock @@ -223,16 +223,16 @@ }, { "name": "doctrine/deprecations", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", - "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", "shasum": "" }, "require": { @@ -264,9 +264,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.2" + "source": "https://github.com/doctrine/deprecations/tree/1.1.3" }, - "time": "2023-09-27T20:04:15+00:00" + "time": "2024-01-30T19:34:25+00:00" }, { "name": "simshaun/recurr", @@ -580,16 +580,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.2", + "version": "3.8.1", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "14f5fff1e64118595db5408e946f3a22c75807f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7", + "reference": "14f5fff1e64118595db5408e946f3a22c75807f7", "shasum": "" }, "require": { @@ -599,11 +599,11 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" }, "bin": [ - "bin/phpcs", - "bin/phpcbf" + "bin/phpcbf", + "bin/phpcs" ], "type": "library", "extra": { @@ -618,22 +618,45 @@ "authors": [ { "name": "Greg Sherwood", - "role": "lead" + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", "standards", "static analysis" ], "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" }, - "time": "2023-02-22T23:07:41+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-01-11T20:47:48+00:00" } ], "aliases": [], diff --git a/include/render.php b/include/render.php index 2add0e3..5c669b2 100644 --- a/include/render.php +++ b/include/render.php @@ -204,11 +204,12 @@