From 3327d5effe6de732ddc30dd5d2e215036ac7f3fd Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Wed, 28 Nov 2018 15:27:33 +0000 Subject: [PATCH] fix #2381 @0:10 --- inc/ws/Util/html5/master/class.ws.html5.compiler.php | 2 +- inc/ws/Util/html5/master/class.ws.html5.links.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 8a42e8dea..7474d1561 100644 --- 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 502ae374d..b89e76383 100644 --- 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'); -- 2.39.5