#1829

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 a1ecf9075870be91af31184612f2b7a930938823..7f13073e7744c9ac8cfa28ae69b8fafbd8789a25 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -423,11 +423,13 @@ class wsHTML5Compiler {
         * Duplicate paths are ignored.
         * @param $path
         */
-       public function addJs($path) {
+       public function addJs($path,$collection=null) {
 
-               // If JS is external, it will be included via the pluginJs collection
-               // Otherwise, it will be compiled into the main JS file
-               $collection = (preg_match('#^https?://#i', $path) === 1) ? 'pluginJs' : 'jsFiles';
+               if(null===$collection) {
+                       // If JS is external, it will be included via the pluginJs collection
+                       // Otherwise, it will be compiled into the main JS file
+                       $collection = (preg_match('#^https?://#i', $path) === 1) ? 'pluginJs' : 'jsFiles';
+               }
 
                if (!in_array($path, $this->$collection)) {
                        $this->{$collection}[] = $path;

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 5ff189a2206ec7952c23bd2d51ec5f6b0c042aa1..a5875284c683c9af851f9a2deeab6fa72c51322e 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -517,7 +517,7 @@ class internalLink extends normalLink {
 
 class videoLink extends wsHTML5Link {
        public static function addVideoJS($compiler) {
-               $compiler->addJs('js/libs/videojs/video.min.js');
+               $compiler->addJs('js/libs/videojs/video.withscalefix.js');
                $compiler->addLess('videojs/videojs');
        }