Merge branch 'master' into dev10
This commit is contained in:
commit
d870722c3a
@ -21,6 +21,10 @@
|
|||||||
- Modification :
|
- Modification :
|
||||||
- Chargement paresseux des images.
|
- Chargement paresseux des images.
|
||||||
|
|
||||||
|
## version 9.2.24
|
||||||
|
- Correction :
|
||||||
|
- Mauvaise configuration de SimpleLightBox
|
||||||
|
|
||||||
## version 9.2.23
|
## version 9.2.23
|
||||||
- Nouveautés :
|
- Nouveautés :
|
||||||
- Configuration du réseau : proxy http ou tcp sans authentification.
|
- Configuration du réseau : proxy http ou tcp sans authentification.
|
||||||
|
@ -33,7 +33,7 @@ class common {
|
|||||||
const TEMP_DIR = 'site/tmp/';
|
const TEMP_DIR = 'site/tmp/';
|
||||||
|
|
||||||
// Numéro de version
|
// Numéro de version
|
||||||
const ZWII_VERSION = '10.0.041.rc';
|
const ZWII_VERSION = '10.0.042';
|
||||||
const ZWII_UPDATE_CHANNEL = "v10";
|
const ZWII_UPDATE_CHANNEL = "v10";
|
||||||
|
|
||||||
public static $actions = [];
|
public static $actions = [];
|
||||||
|
13
core/vendor/simplelightbox/init.js
vendored
13
core/vendor/simplelightbox/init.js
vendored
@ -7,7 +7,14 @@
|
|||||||
);
|
);
|
||||||
|
|
||||||
// Démarrer le script
|
// 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: "×"
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
@ -283,9 +283,10 @@ class gallery extends common {
|
|||||||
$this->addOutput([
|
$this->addOutput([
|
||||||
'showBarEditButton' => true,
|
'showBarEditButton' => true,
|
||||||
'title' => $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'config', 'name']),
|
'title' => $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'config', 'name']),
|
||||||
|
/* Désactivé car SLB est actif pour tout le site
|
||||||
'vendor' => [
|
'vendor' => [
|
||||||
'simplelightbox'
|
'simplelightbox'
|
||||||
],
|
],*/
|
||||||
'view' => 'gallery'
|
'view' => 'gallery'
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
@ -12,10 +12,12 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Galerie d'image
|
* Galerie d'image
|
||||||
*/
|
* SLB est activé pour tout le site
|
||||||
|
*
|
||||||
$(".galleryGalleryPicture").simpleLightbox({
|
$(".galleryGalleryPicture").simpleLightbox({
|
||||||
captionSelector: "self",
|
captionSelector: "self",
|
||||||
captionType: "data",
|
captionType: "data",
|
||||||
captionsData: "caption",
|
captionsData: "caption",
|
||||||
closeText: "×"
|
closeText: "×"
|
||||||
});
|
});
|
||||||
|
*/
|
Loading…
Reference in New Issue
Block a user