wait #5703 @2

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index ba8edd4d6e05dece917970c11c0911dfd1f2fef5..df2ff098d79042f6f97bd67d682c987467c6683a 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -743,33 +743,51 @@ class wsHTML5Compiler
         }
 
         $this->config->product_zoom_references = [];
-        $files = ['360°', 'Image supplémentaire', 'Fiche technique'];
+        $fileCols = ['360°', 'Image supplémentaire', 'Fiche technique'];
         foreach ($this->config->basketReferences as $ref => $data) {
             $r = [];
-            foreach ($files as $file) {
-                if (!isset($data[$file])) {
-                    $data[$file] = '';
-                }
-                $fname = trim($data[$file]);
-                if ($fname !== '') {
-                    $fname = str_replace(' ', '-', $fname);
-                    $wfile = $this->wdir . 'commerce/' . $fname;
+            foreach ($fileCols as $col) {
+                $slides = [];
+                $button = '';
+                if (!isset($data[$col]) || !trim($data[$col])) {
+                    $files = [];
+                    $this->config->basketReferences[$ref][$col] = '';
+                } else {
+                    $files = explode(',', $data[$col]);
 
-                    if (file_exists($wfile)) {
+                    $files = array_map(function ($v) {
+                        return str_replace([' ', '(', ')'], ['-', '', ''], trim($v));
+                    }, $files);
+
+                    $files = array_filter($files, function ($v) {
+                        if (!$v) {
+                            return false;
+                        }
+                        return file_exists($this->wdir . 'commerce/' . $v);
+                    });
+
+                    foreach ($files as $fname) {
+                        $wfile = $this->wdir . 'commerce/' . $fname;
                         if (stristr($wfile, '.png') || stristr($wfile, '.jpg')) {
                             $s = CubeIT_Image::getimagesize($wfile);
-                            $html = '<img src="data/commerce/' . $fname . '" style="background:white;" data-width="' . $s[0] . '" data-height="' . $s[1] . '" />';
+                            if (count($files) <= 1) {
+                                $button .= '<img src="data/commerce/' . $fname . '" style="background:white;" data-width="' . $s[0] . '" data-height="' . $s[1] . '" />';
+                            } else {
+                                $slides[] = ['path' => 'data/commerce/' . $fname, 'absolute_path' => $wfile];
+                            }
                         } else {
-                            $html = 'data/commerce/' . $fname;
+                            $button = 'data/commerce/' . $fname;
                         }
                         $this->vdir->copy($wfile, 'data/commerce/' . $fname);
-                        $fname = $html;
-                    } else {
-                        $fname = '';
                     }
                 }
-                $r[] = $fname;
+                if (count($files) > 1) {
+                    $button = slideshowLink::generateSlideshowHtml($slides, [], ['type' => 'loop']);
+                    $this->addSlideshowLibrary(false);
+                }
+                $r[] = $button;
             }
+
             $this->config->product_zoom_references[$ref] = $r;
         }
 
@@ -2432,7 +2450,6 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
             }
         }
 
-
         $this->config->pagesOfCustomLinks = $pagesOfCustomLinks;
 
         $i = 1;
@@ -2444,12 +2461,10 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
         $allLinksData = [];
         $gamifyCoins = [];
 
-
         usort($links, array($this, '_sortLinks'));
 
-        $this->log('Links 3.5');
-
         foreach ($links as $linkData) {
+
             if (in_array($linkData['type'], $ignore)) {
                 continue;
             }
@@ -2481,6 +2496,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
                 $linksToAdd[] = $link->getRightClone();
             }
 
+
             foreach ($linksToAdd as $lta) {
                 /** @var $lta wsLink */
                 // Keep this line because some properties of the link (like blend mode) are parsed with this function
@@ -2529,7 +2545,6 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
             if ($link->keep()) {
                 $this->hiddenContents[] = $link->getHTMLContainer();
             }
-            $this->log('Links 4 :: ' . $link->to);
         }
 
         $this->log('Links 4');

diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php
index d25fa138d6c1aeb3a30758fcd8a4016f12d8839d..e565160ffabb3ca3deddccafa2efd451f91e07e0 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -3092,10 +3092,6 @@ class slideshowLink extends normalLink
         return 'data-slideshow="' . rawurlencode($this->generateSlideshow('popup')) . '" ';
     }
 
-//    public function keep() {
-//        return true;
-//    }
-
     public function getDefaultTooltip()
     {
         return 'view slideshow';
@@ -3112,13 +3108,6 @@ class slideshowLink extends normalLink
         $slideshowID = 'slideshow_' . $this->uid;
         $XML_path = $this->path_absolute . '/slideshow.xml'; // Optional file so it may not exist
 
-        // Default Slick settings (can be overridden by slideshow.xml)
-        $slideshow_settings = [
-            'autoplay' => false,
-            'fade' => false,
-        ];
-
-
         $slides = [];
         $slides_options = [];
 
@@ -3165,16 +3154,47 @@ class slideshowLink extends normalLink
             $thumbnails = (count($slides) > 1);
         }
 
+        $options = ['openIndex' => $this->extra,
+            'thumbnails' => $thumbnails,
+            'thumbnail_height' => $this->thumbnail_height,
+            'id' => $slideshowID,
+            'library' => ($context === 'popup' ? $this->compiler->book->parametres->popupSlideshowLibrary : $this->compiler->book->parametres->inlineSlideshowLibrary)
+        ];
+
+        return self::generateSlideshowHtml($slides, $options, $slideshow_settings, $slides_options);
+
+    }
+
+
+    public static function generateSlideshowHtml($slides, $options = [], $slideshowSettings = [], $slidesOptions = [])
+    {
+        // Default Slick settings (can be overridden by slideshow.xml)
+        $slideshowDefaultSettings = [
+            'autoplay' => false,
+            'fade' => false,
+            'type' => 'slide',
+            'rewind' => false,
+        ];
+
+        $defaultOptions = [
+            'library' => 'splide',
+            'openIndex' => 0,
+            'thumbnails' => false,
+            'id' => 'slideshow_' . rand(1000, 1000000),
+            'context' => 'popup',
+            'thumbnail_height' => 80,
+        ];
+        $options = array_merge($defaultOptions, $options);
+        $slideshowSettings = array_merge($slideshowDefaultSettings, $slideshowSettings);
+
         // Main slider
-        $res = '<div class="fb-slideshow splide" id="' . $slideshowID . '" data-open-index="' . $this->extra . '" data-thumbnails="' . ($thumbnails ? '1' : '0') . '" data-splide=\'' . json_encode($slideshow_settings) . '\'>' . $this->_slides($slides, $slides_options) . '</div>';
+        $res = '<div class="fb-slideshow splide" id="' . $options['id'] . '" data-open-index="' . $options['openIndex'] . '" data-thumbnails="' . ($options['thumbnails'] ? '1' : '0') . '" data-splide=\'' . json_encode($slideshowSettings) . '\'>' . self::_slides($slides, $slidesOptions) . '</div>';
 
         // Thumbnails slider
-        if ($thumbnails) {
-            $res .= '<div class="fb-slideshow-thumbnails splide" id="' . $slideshowID . '_thumbnails">' . $this->_slides($slides, ['show_captions' => false, 'max_height' => $this->thumbnail_height]) . '</div>';
+        if ($options['thumbnails']) {
+            $res .= '<div class="fb-slideshow-thumbnails splide" id="' . $options['id'] . '_thumbnails">' . self::_slides($slides, ['show_captions' => false, 'max_height' => $options['thumbnail_height']]) . '</div>';
         }
-
-        $lib = $context === 'popup' ? $this->compiler->book->parametres->popupSlideshowLibrary : $this->compiler->book->parametres->inlineSlideshowLibrary;
-        return '<div class="fb-slideshow-wrapper ' . $lib . ' fb-slideshow-' . $context . '">' . $res . '</div>';
+        return '<div class="fb-slideshow-wrapper ' . $options['library'] . ' fb-slideshow-' . $options['library'] . '">' . $res . '</div>';
     }
 
     protected function _getSlidesFromDirectory($path)
@@ -3195,14 +3215,14 @@ class slideshowLink extends normalLink
             if (!in_array($ext, $this->allowed_extensions)) {
                 continue;
             }
-            $slides[] = ['path' => $this->path . '/' . $file->getFilename(), 'absolute_path' =>  $file->getPathname(), 'caption' => null];
+            $slides[] = ['path' => $this->path . '/' . $file->getFilename(), 'absolute_path' => $file->getPathname(), 'caption' => null];
             uasort($slides, [$this, '_orderSlidesByFilename']);
         }
 
         return $slides;
     }
 
-    protected function _slides($slides, $options = [])
+    protected static function _slides($slides, $options = [])
     {
         $default_options = [
             'show_captions' => true,
@@ -3212,10 +3232,13 @@ class slideshowLink extends normalLink
 
         $options = array_merge($default_options, $options);
 
+        $defaultSlide = ['caption' => null];
+
         $res = '<div class="splide__track">';
         $res .= '<ul class="splide__list">';
 
         foreach ($slides as $slide) {
+            $slide = array_merge($defaultSlide, $slide);
             $image_info = CubeIT_Image::getimagesize($slide['absolute_path']);
             $image_info_json = ($image_info) ? json_encode(['width' => $image_info[0], 'height' => $image_info[1], 'ratio' => round($image_info[0] / $image_info[1], 4)]) : '';
             $image_dimensions = ($image_info && isset($image_info[3])) ? $image_info[3] : '';
@@ -3228,9 +3251,7 @@ class slideshowLink extends normalLink
             }
 
             $res .= '<li class="fb-slideshow-slide splide__slide">';
-            //$res .= '<div class="splide__slide__container">';
             $res .= '<img class="fb-slideshow-slide-image" src="' . $slide['path'] . '" data-meta="' . htmlspecialchars($image_info_json, ENT_QUOTES) . '" ' . $image_dimensions . '>';
-            //$res .= '</div>'; // .splide__slide__container
 
             if ($options['show_captions'] && null !== $slide['caption']) {
 
@@ -3249,7 +3270,6 @@ class slideshowLink extends normalLink
         return $res;
     }
 
-
     protected function _orderSlidesByFilename($a, $b)
     {
         return strcmp($a['path'], $b['path']);