From 566f35231702afa012102a86e9cf55c191c0835e Mon Sep 17 00:00:00 2001 From: fredtempez Date: Wed, 11 Mar 2020 21:42:59 +0100 Subject: [PATCH 1/2] =?UTF-8?q?[9.2.24]=20fix=20probl=C3=A8me=20simpleligh?= =?UTF-8?q?tbox?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 2 +- core/vendor/simplelightbox/init.js | 13 ++++++++++--- module/gallery/gallery.php | 3 ++- module/gallery/view/gallery/gallery.js.php | 6 ++++-- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/core/core.php b/core/core.php index 3eea2f0e..d53ef323 100644 --- a/core/core.php +++ b/core/core.php @@ -33,7 +33,7 @@ class common { const TEMP_DIR = 'site/tmp/'; // Numéro de version - const ZWII_VERSION = '9.2.23'; + const ZWII_VERSION = '9.2.24'; const ZWII_UPDATE_CHANNEL = "v9"; public static $actions = []; diff --git a/core/vendor/simplelightbox/init.js b/core/vendor/simplelightbox/init.js index ef3662f4..60548378 100644 --- a/core/vendor/simplelightbox/init.js +++ b/core/vendor/simplelightbox/init.js @@ -7,7 +7,14 @@ ); // Démarrer le script - //var a = $('.gallery').simpleLightbox({closeText:"×",captionsData:'alt'}); - - + var a = new SimpleLightbox('.gallery', { + closeText:"×", + captionsData:'alt' + }); + var b = new SimpleLightbox('.galleryGalleryPicture', { + captionSelector: "self", + captionType: "data", + captionsData: "caption", + closeText: "×" + }); }); diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php index da6f4a64..f463f634 100644 --- a/module/gallery/gallery.php +++ b/module/gallery/gallery.php @@ -283,9 +283,10 @@ class gallery extends common { $this->addOutput([ 'showBarEditButton' => true, 'title' => $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'config', 'name']), + /* Désactivé car SLB est actif pour tout le site 'vendor' => [ 'simplelightbox' - ], + ],*/ 'view' => 'gallery' ]); } diff --git a/module/gallery/view/gallery/gallery.js.php b/module/gallery/view/gallery/gallery.js.php index d8da03b9..df402f14 100644 --- a/module/gallery/view/gallery/gallery.js.php +++ b/module/gallery/view/gallery/gallery.js.php @@ -12,10 +12,12 @@ /** * Galerie d'image - */ + * SLB est activé pour tout le site + * $(".galleryGalleryPicture").simpleLightbox({ captionSelector: "self", captionType: "data", captionsData: "caption", closeText: "×" -}); \ No newline at end of file +}); +*/ \ No newline at end of file From 88ff8c6449dacf113eb3f9c341759b93afae4faa Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Thu, 12 Mar 2020 08:49:58 +0100 Subject: [PATCH 2/2] Changes.md --- CHANGES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index d9d822a2..3bdf134c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Changelog +## version 9.2.24 +- Correction : + - Mauvaise configuration de SimpleLightBox + ## version 9.2.23 - Nouveautés : - Configuration du réseau : proxy http ou tcp sans authentification.