fix #2381 @0:10

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 8a42e8deae1f701983d7e93e760e2217aaf0540f..7474d156101dfa7718b699b285a81e246e0ca117 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1245,7 +1245,7 @@ class wsHTML5Compiler
                                mkdir(dirname($minimized));
                        }
                        if (file_exists($minimized)) {
-                               $mintime = max(filemtime($minimized), filemtime(__FILE__));
+                               $mintime = filemtime($minimized);
                                $reminimize = false;
                        } else {
                                $mintime = 0;

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 502ae374d9e0f8376828ad1c1477e9a991bfbc3c..b89e76383e8c6189d1bf77c02191a2860e3377b6 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -525,7 +525,7 @@ class zoomhdLink extends normalLink
 {
        public function init()
        {
-               $this->compiler->addJs('js/libs/fluidbook/links/fluidbook.links.zoomhd.js');
+               $this->compiler->addJsLib('fluidbook-zoomhd', 'js/libs/fluidbook/links/fluidbook.links.zoomhd.js');
                $this->compiler->writeLinksData = true;
        }
 
@@ -871,7 +871,7 @@ class webVideoLink extends videoLink
 
                switch ($data->video_service) {
                        case 0: // YouTube
-                               $compiler->addJs('js/libs/videojs/Youtube.js');
+                               $compiler->addJsLib('videojs-youtube', 'js/libs/videojs/Youtube.js');
                                //                $compiler->addJs('https://rawgit.com/videojs/videojs-youtube/master/dist/Youtube.js');
                                $setup = [
                                        'techOrder' => ['youtube'],
@@ -1738,7 +1738,7 @@ class slideshowLink extends normalLink
        public function generateSlideshow()
        {
 
-               $this->compiler->addJs('js/libs/slick/slick.js');
+               $this->compiler->addJsLib('slick', 'js/libs/slick/slick.js');
                $this->compiler->addLess('slick/slick-bundle');
                $this->compiler->addLess('fluidbook.slideshow');