From 7794cc1d1888cc09aba350d2be77066a9a9661d1 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 15 Feb 2023 10:55:21 +0100 Subject: [PATCH] wait #5734 @0.5 --- app/SubForms/Link/Audio.php | 6 +- app/SubForms/Link/Base.php | 3 +- app/SubForms/Link/Multimedia.php | 6 +- app/SubForms/Link/Tooltip.php | 4 +- app/SubForms/Link/Video.php | 10 +- composer.lock | 105 +++++-------------- resources/linkeditor/js/linkeditor.form.js | 8 +- resources/linkeditor/style/inc/_form.sass | 8 +- resources/linkeditor/style/inc/_toolbar.sass | 2 +- 9 files changed, 55 insertions(+), 97 deletions(-) diff --git a/app/SubForms/Link/Audio.php b/app/SubForms/Link/Audio.php index 0bed180e0..de081c6e4 100644 --- a/app/SubForms/Link/Audio.php +++ b/app/SubForms/Link/Audio.php @@ -2,7 +2,7 @@ namespace App\SubForms\Link; -use Cubist\Backpack\Magic\Fields\Checkbox; +use Cubist\Backpack\Magic\Fields\CheckboxBasic; use Cubist\Backpack\Magic\Fields\FilesOrURL; class Audio extends Base @@ -19,7 +19,7 @@ class Audio extends Base public function addMultimediaFields() { parent::addMultimediaFields(); - $this->addField('video_auto_start', Checkbox::class, __('Jouer l\'audio automatiquement'), ['default' => true]); - $this->addField('video_loop', Checkbox::class, __('Jouer l\'audio en boucle'), ['default' => false]); + $this->addField('video_auto_start', CheckboxBasic::class, __('Jouer l\'audio automatiquement'), ['default' => true]); + $this->addField('video_loop', CheckboxBasic::class, __('Jouer l\'audio en boucle'), ['default' => false]); } } diff --git a/app/SubForms/Link/Base.php b/app/SubForms/Link/Base.php index dfd613597..a89ae6c71 100644 --- a/app/SubForms/Link/Base.php +++ b/app/SubForms/Link/Base.php @@ -8,6 +8,7 @@ use App\Fields\FluidbookLinkEditor\MultimediaIntegration; use App\Fields\FluidbookLinkEditor\RolloverAnimation; use App\Jobs\FluidbookCompiler; use App\Models\FluidbookPublication; +use Cubist\Backpack\Magic\Fields\CheckboxBasic; use Cubist\Backpack\Magic\Fields\Checkbox; use Cubist\Backpack\Magic\Fields\FieldGroupEnd; use Cubist\Backpack\Magic\Fields\FieldGroupStart; @@ -193,7 +194,7 @@ class Base extends Form } $this->addField('header_tooltip', FormSection::class, __('Infobulle')); $this->addField('tooltip', Text::class, __('Texte de l\'infobulle'), ['hint' => __('Laisser vide pour conserver le texte par défaut')]); - $this->addField('display_area', Checkbox::class, __('Afficher la zone de couleur au survol'), ['default' => true]); + $this->addField('display_area', CheckboxBasic::class, __('Afficher la zone de couleur au survol'), ['default' => true]); } public function addTypeField() diff --git a/app/SubForms/Link/Multimedia.php b/app/SubForms/Link/Multimedia.php index 0774f954b..7a8f75dea 100644 --- a/app/SubForms/Link/Multimedia.php +++ b/app/SubForms/Link/Multimedia.php @@ -2,7 +2,7 @@ namespace App\SubForms\Link; -use Cubist\Backpack\Magic\Fields\Checkbox; +use Cubist\Backpack\Magic\Fields\CheckboxBasic; use Cubist\Backpack\Magic\Fields\FilesOrURL; class Multimedia extends Base @@ -19,8 +19,8 @@ class Multimedia extends Base public function addMultimediaFields() { parent::addMultimediaFields(); - $this->addField('interactive', Checkbox::class, __('Animation interactive'), ['default' => false]); - $this->addField('read_mode', Checkbox::class, __('Mode lecture'), ['hint' => __('Scroll vertical possible'), 'default' => false]); + $this->addField('interactive', CheckboxBasic::class, __('Animation interactive'), ['default' => false]); + $this->addField('read_mode', CheckboxBasic::class, __('Mode lecture'), ['hint' => __('Scroll vertical possible'), 'default' => false]); $this->addMultimediaSizeFields(); } } diff --git a/app/SubForms/Link/Tooltip.php b/app/SubForms/Link/Tooltip.php index 3a5d66789..808344b37 100644 --- a/app/SubForms/Link/Tooltip.php +++ b/app/SubForms/Link/Tooltip.php @@ -2,7 +2,7 @@ namespace App\SubForms\Link; -use Cubist\Backpack\Magic\Fields\Checkbox; +use Cubist\Backpack\Magic\Fields\CheckboxBasic; use Cubist\Backpack\Magic\Fields\FormSection; use Cubist\Backpack\Magic\Fields\Textarea; @@ -23,6 +23,6 @@ class Tooltip extends Base } $this->addField('header_tooltip', FormSection::class, __('Paramètres')); $this->addField('tooltip', Textarea::class, __('Texte de l\'infobulle')); - $this->addField('display_area', Checkbox::class, __('Afficher la zone de couleur au survol'), ['default' => true]); + $this->addField('display_area', CheckboxBasic::class, __('Afficher la zone de couleur au survol'), ['default' => true]); } } diff --git a/app/SubForms/Link/Video.php b/app/SubForms/Link/Video.php index 8876b2da7..1108c593c 100644 --- a/app/SubForms/Link/Video.php +++ b/app/SubForms/Link/Video.php @@ -2,7 +2,7 @@ namespace App\SubForms\Link; -use Cubist\Backpack\Magic\Fields\Checkbox; +use Cubist\Backpack\Magic\Fields\CheckboxBasic; use Cubist\Backpack\Magic\Fields\FilesOrURL; class Video extends Base @@ -19,10 +19,10 @@ class Video extends Base public function addMultimediaFields() { parent::addMultimediaFields(); - $this->addField('video_auto_start', Checkbox::class, __('Jouer la vidéo automatiquement'), ['default' => true]); - $this->addField('video_controls', Checkbox::class, __('Afficher les contrôles de la vidéo'), ['default' => true]); - $this->addField('video_sound_on', Checkbox::class, __('Activer le son de la vidéo'), ['default' => true]); - $this->addField('video_loop', Checkbox::class, __('Jouer la vidéo en boucle'), ['default' => false]); + $this->addField('video_auto_start', CheckboxBasic::class, __('Jouer la vidéo automatiquement'), ['default' => true]); + $this->addField('video_controls', CheckboxBasic::class, __('Afficher les contrôles de la vidéo'), ['default' => true]); + $this->addField('video_sound_on', CheckboxBasic::class, __('Activer le son de la vidéo'), ['default' => true]); + $this->addField('video_loop', CheckboxBasic::class, __('Jouer la vidéo en boucle'), ['default' => false]); $this->addMultimediaSizeFields(); } diff --git a/composer.lock b/composer.lock index 1475e7b71..49ba241da 100644 --- a/composer.lock +++ b/composer.lock @@ -1167,58 +1167,6 @@ ], "time": "2020-09-08T20:04:29+00:00" }, - { - "name": "calebporzio/sushi", - "version": "v2.4.4", - "source": { - "type": "git", - "url": "https://github.com/calebporzio/sushi.git", - "reference": "8eeafda290e9a09abe6b102c3925c9434d1c87a5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/calebporzio/sushi/zipball/8eeafda290e9a09abe6b102c3925c9434d1c87a5", - "reference": "8eeafda290e9a09abe6b102c3925c9434d1c87a5", - "shasum": "" - }, - "require": { - "illuminate/database": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0", - "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0", - "php": "^7.1.3|^8.0" - }, - "require-dev": { - "doctrine/dbal": "^2.9 || ^3.1.4", - "orchestra/testbench": "3.8.* || 3.9.* || ^4.0 || ^6.0 || ^7.0 || ^8.0", - "phpunit/phpunit": "^7.5 || ^8.4 || ^9.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Sushi\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Caleb Porzio", - "email": "calebporzio@gmail.com" - } - ], - "description": "Eloquent's missing \"array\" driver.", - "support": { - "source": "https://github.com/calebporzio/sushi/tree/v2.4.4" - }, - "funding": [ - { - "url": "https://github.com/calebporzio", - "type": "github" - } - ], - "time": "2023-01-11T16:19:01+00:00" - }, { "name": "chrisjean/php-ico", "version": "1.0.4", @@ -1712,13 +1660,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_cms-back.git", - "reference": "612b646c92beff84bb422a48680450270aee7188" + "reference": "3cbabfd839e1ee1449dfe53050e2f5537d0dd7fd" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-fb9b36.tar", - "reference": "612b646c92beff84bb422a48680450270aee7188", - "shasum": "28c7f1aff4471fcb5447e05970a75c4950560563" + "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-37b21b.tar", + "reference": "3cbabfd839e1ee1449dfe53050e2f5537d0dd7fd", + "shasum": "a5d02527b1621e284024d141f3d71634cd90d7fb" }, "require": { "backpack/backupmanager": "^3.0", @@ -1730,7 +1678,6 @@ "cache/filesystem-adapter": "^1.2", "cache/redis-adapter": "^1.0", "calebporzio/parental": "^v0.11", - "calebporzio/sushi": "^2.4", "chrisjean/php-ico": "^1.0", "cubist/cms-front": "dev-master", "cubist/laravel-backpack-dropzone-field": "dev-master", @@ -1800,7 +1747,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2023-02-13T17:05:54+00:00" + "time": "2023-02-15T09:41:45+00:00" }, { "name": "cubist/cms-front", @@ -2098,13 +2045,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_net.git", - "reference": "e213e6046d77cc20ee479b8c14f83421d24ee2e1" + "reference": "48d99d29868cf879ddd258e89ff23f1c19820d8e" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/net/cubist-net-dev-master-efc712.tar", - "reference": "e213e6046d77cc20ee479b8c14f83421d24ee2e1", - "shasum": "f3a041071c026628a35308b157886bcf0ca93395" + "url": "https://composer.cubedesigners.com/dist/cubist/net/cubist-net-dev-master-6b4fb6.tar", + "reference": "48d99d29868cf879ddd258e89ff23f1c19820d8e", + "shasum": "47fdf6d79be5d8fbdd6113a1b3d8e67f94436fa4" }, "require": { "cubist/util": "dev-master", @@ -2128,7 +2075,7 @@ } ], "description": "net cubist composer package", - "time": "2023-02-13T17:05:40+00:00" + "time": "2023-02-13T18:16:16+00:00" }, { "name": "cubist/pdf", @@ -2223,13 +2170,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_util.git", - "reference": "714ff12cfdb84730b11c28b24bbe40957fb845dc" + "reference": "02768d2b258ac6708f206dca5aeb9420e1153257" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-53a8e7.tar", - "reference": "714ff12cfdb84730b11c28b24bbe40957fb845dc", - "shasum": "a58cedad00a24769293c5a8a9ec483d41aa1443a" + "url": "https://composer.cubedesigners.com/dist/cubist/util/cubist-util-dev-master-bb5cdf.tar", + "reference": "02768d2b258ac6708f206dca5aeb9420e1153257", + "shasum": "97c896e61e6827eb440d9c55a34084dd985096a1" }, "require": { "cubist/net": "dev-master", @@ -2261,7 +2208,7 @@ } ], "description": "Utilities class", - "time": "2023-02-13T17:11:35+00:00" + "time": "2023-02-13T18:23:34+00:00" }, { "name": "cviebrock/eloquent-sluggable", @@ -3557,13 +3504,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/fluidbook_tools.git", - "reference": "2132b45c35bd4193d11bae14dd5f9719f482994f" + "reference": "50790263fc1fc1d9311afe0f5e3d4d04ca6f65fc" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-9196ac.tar", - "reference": "2132b45c35bd4193d11bae14dd5f9719f482994f", - "shasum": "bc83efd34bbe63534ee7c192a11c171e88351e77" + "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-cf2579.tar", + "reference": "50790263fc1fc1d9311afe0f5e3d4d04ca6f65fc", + "shasum": "1e2966db7f6afa410a85819018679f70a924f35b" }, "require": { "barryvdh/laravel-debugbar": "^3.6", @@ -3597,7 +3544,7 @@ } ], "description": "Fluidbook Tools", - "time": "2023-02-10T18:28:14+00:00" + "time": "2023-02-14T16:32:32+00:00" }, { "name": "genealabs/laravel-model-caching", @@ -5568,16 +5515,16 @@ }, { "name": "league/glide", - "version": "1.7.1", + "version": "1.7.2", "source": { "type": "git", "url": "https://github.com/thephpleague/glide.git", - "reference": "257e0c3612ef3dc57eb7f90cb741198151a45a5f" + "reference": "8dba756ada0b8e525bf6f1f7d1bd83c1e99e124e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/glide/zipball/257e0c3612ef3dc57eb7f90cb741198151a45a5f", - "reference": "257e0c3612ef3dc57eb7f90cb741198151a45a5f", + "url": "https://api.github.com/repos/thephpleague/glide/zipball/8dba756ada0b8e525bf6f1f7d1bd83c1e99e124e", + "reference": "8dba756ada0b8e525bf6f1f7d1bd83c1e99e124e", "shasum": "" }, "require": { @@ -5632,9 +5579,9 @@ ], "support": { "issues": "https://github.com/thephpleague/glide/issues", - "source": "https://github.com/thephpleague/glide/tree/1.7.1" + "source": "https://github.com/thephpleague/glide/tree/1.7.2" }, - "time": "2022-04-27T04:03:46+00:00" + "time": "2023-02-14T06:26:04+00:00" }, { "name": "league/mime-type-detection", diff --git a/resources/linkeditor/js/linkeditor.form.js b/resources/linkeditor/js/linkeditor.form.js index ad8f8750d..8003f74c0 100644 --- a/resources/linkeditor/js/linkeditor.form.js +++ b/resources/linkeditor/js/linkeditor.form.js @@ -44,7 +44,6 @@ LinkeditorForm.prototype = { $this.saveFormDataInLink(); }); - $(document).on('change', ".freefile-file-input", function () { var form = $('#linkupload').clone(); @@ -179,11 +178,16 @@ LinkeditorForm.prototype = { } v = Math.round(v * 100000) / 100000; } - $(form).find('[name=' + k + ']').val(v); + if ($(form).find('[type="checkbox"][name=' + k + ']').length > 0) { + $(form).find('[type="checkbox"][name=' + k + ']').prop('checked', v == 1); + } else { + $(form).find('[name=' + k + ']').val(v); + } }); this.unmaskChangeEvent(); }, + maskChangeEvent: function () { this._maskChangeEvent = true; }, diff --git a/resources/linkeditor/style/inc/_form.sass b/resources/linkeditor/style/inc/_form.sass index 274c210d5..fdf9a47bd 100644 --- a/resources/linkeditor/style/inc/_form.sass +++ b/resources/linkeditor/style/inc/_form.sass @@ -30,6 +30,7 @@ input[type="checkbox"] appearance: none position: relative cursor: pointer + color: var(--form-text-color) &::before content: '' @@ -206,11 +207,16 @@ button .checkbox margin: 4px 0 5px 0 + position: relative + top: 6px + label vertical-align: baseline display: inline-block position: relative - top: 2px + top: -4px + margin: 0 + cursor: pointer span margin-left: 5px diff --git a/resources/linkeditor/style/inc/_toolbar.sass b/resources/linkeditor/style/inc/_toolbar.sass index c844536a9..96ad770d5 100644 --- a/resources/linkeditor/style/inc/_toolbar.sass +++ b/resources/linkeditor/style/inc/_toolbar.sass @@ -58,7 +58,7 @@ cursor: text font-size: 13px position: relative - top: 2px + top: -7px user-select: none margin: 0 8px font-weight: 600 -- 2.39.5