From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 11 Dec 2017 10:59:28 +0000 (+0000)
Subject: #1829
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=07e63aecff5664944ab564df3934921b01d47010;p=cubeextranet.git

#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 a1ecf9075..7f13073e7 100644
--- 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 5ff189a22..a5875284c 100644
--- 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');
 	}