fix #2829 @0:15

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 7d034d8bb18aed7b873a9db50420177cbea85302..9f2bf926e34827102b8d3bd5a5c41946b6e261f7 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1472,11 +1472,12 @@ class wsHTML5Compiler
                     $uglify->execute();
                     $uglify->debug();
                 } else {
+                    $uglify = null;
                     copy($tmp, $minimized);
                 }
 
                 if (!file_exists($minimized) || filesize($minimized) == 0) {
-                    die('An error occured while uglifying ' . $hasNonMin . '? ' . $minimized . ': ' . $uglify->commande . ' :: ' . $uglify->output);
+                    die('An error occured while uglifying ' . $hasNonMin . '? ' . $minimized . ': ' . ($uglify ?? $uglify->commande) . ' :: ' . ($uglify ?? $uglify->output) . '(' . implode(',', $files) . ')');
                 }
             }
             $dest = 'data/' . $jsfinal . '.js';

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 86fb08f778928ee7d21707f9a023336b57265f41..9d43ccaf5c35e94e29ea8119031d2bc6e9cfbb2e 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -1887,7 +1887,7 @@ class slideshowLink extends normalLink
     public function generateSlideshow()
     {
 
-        $this->compiler->addJsLib('slick', 'js/libs/slick/slick.js');
+        $this->compiler->addJsLib('slick', 'js/libs/slick/slick.min.js');
         $this->compiler->addLess('slick/slick-bundle');
         $this->compiler->addLess('fluidbook.slideshow');