From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 10 Oct 2017 09:38:33 +0000 (+0000)
Subject: #1738
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=384b2823b8d3d2b695d7120f330c7dcd4144eb3e;p=cubeextranet.git

#1738
---

diff --git a/inc/ws/Util/html5/bookedges/class.ws.html5.compiler.php b/inc/ws/Util/html5/bookedges/class.ws.html5.compiler.php
index d9da8fe5f..5dc5dc8f2 100644
--- a/inc/ws/Util/html5/bookedges/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/bookedges/class.ws.html5.compiler.php
@@ -1411,8 +1411,7 @@ class wsHTML5Compiler {
 			// Less files must be copied to temporary directory so they'll
 			// have access to the variables generated in book-variables.less
 			copy($source_less, $destination_less);
-			$less = new CubeIT_CommandLine('lessc');
-			$less->setArg('plugin', 'less-plugin-clean-css');
+			$less = new CubeIT_CommandLine('/usr/local/bin/lessc');
 			$less->setArg(null, $destination_less);
 			$less->setArg(null, $destination_css);
 			$less->execute();
diff --git a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php
index 6a39d6cf1..a5d54f784 100644
--- a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php
@@ -1404,8 +1404,7 @@ class wsHTML5Compiler {
 			// Less files must be copied to temporary directory so they'll
 			// have access to the variables generated in book-variables.less
 			copy($source_less, $destination_less);
-			$less = new CubeIT_CommandLine('lessc');
-			$less->setArg('plugin', 'less-plugin-clean-css');
+			$less = new CubeIT_CommandLine('/usr/local/bin/lessc');
 			$less->setArg(null, $destination_less);
 			$less->setArg(null, $destination_css);
 			$less->execute();
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 e8d8123a3..3539b6b3d 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -951,10 +951,8 @@ class wsHTML5Compiler {
 				$tmp = cubeFiles::tempnam();
 				file_put_contents($tmp, $js);
 
-				$uglify = new CubeIT_CommandLine('uglifyjs');
-				$uglify->setPath(CONVERTER_PATH);
+				$uglify = new CubeIT_CommandLine('/usr/local/bin/uglifyjs');
 				$uglify->setArg('o', $minimized);
-				$uglify->setArg('no-copyright');
 				$uglify->setArg(null, $tmp);
 				$uglify->execute();
 				$uglify->debug();
@@ -1496,11 +1494,12 @@ class wsHTML5Compiler {
 			// Less files must be copied to temporary directory so they'll
 			// have access to the variables generated in book-variables.less
 			copy($source_less, $destination_less);
-			$less = new CubeIT_CommandLine('lessc');
-			$less->setArg('plugin', 'less-plugin-clean-css');
+			$less = new CubeIT_CommandLine('/usr/local/bin/lessc');
+			//$less->setArg('clean-css', '--s1 --advanced --compatibility=ie10');
 			$less->setArg(null, $destination_less);
 			$less->setArg(null, $this->vdir . '/' . $destination_css);
 			$less->execute();
+			$less->debug();
 			if (!file_exists($this->vdir . '/' . $destination_css)) {
 				die($less->output);
 			}
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 5ad7c36dd..e919b7476 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -528,8 +528,8 @@ class videoLink extends wsHTML5Link {
 		$h = round($this->height * $this->getCssScale());
 
 		// Note: width and height for the video is normally measured from the
-        // preview frame for local files or set to 1280 x 720 for web videos.
-        // The $w and $h variables here seem to be null generally...
+		// preview frame for local files or set to 1280 x 720 for web videos.
+		// The $w and $h variables here seem to be null generally...
 
 		return $this->makeVideoTag($this, $w, $h, $this->compiler);
 	}
@@ -567,7 +567,7 @@ class videoLink extends wsHTML5Link {
 			$attr['height'] = $h;
 
 		} else if (!is_null($compiler)) {
-            // Get video dimensions from thumbnail if possible (locally uploaded files)
+			// Get video dimensions from thumbnail if possible (locally uploaded files)
 			$path = WS_BOOKS . '/working/' . $compiler->book_id . '/' . $basename . '.jpg';
 			$dim = getimagesize($path);
 			$attr['width'] = $dim[0];
@@ -750,7 +750,8 @@ class actionLink extends internalLink {
 		if (in_array($this->to, $this->_share)) {
 			return parent::getAdditionnalContent() . ' data-service="' . $this->to . '" ';
 		} else {
-			return parent::getClasses() . ' data-action="' . $this->to . '" ';
+			return /*parent::getClasses()*/
+				' data-action="' . $this->to . '" ';
 		}
 	}
 
diff --git a/inc/ws/Util/html5/searchengine/class.ws.html5.compiler.php b/inc/ws/Util/html5/searchengine/class.ws.html5.compiler.php
index 3605ee5af..a535b6374 100644
--- a/inc/ws/Util/html5/searchengine/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/searchengine/class.ws.html5.compiler.php
@@ -1504,8 +1504,7 @@ class wsHTML5Compiler {
 			// Less files must be copied to temporary directory so they'll
 			// have access to the variables generated in book-variables.less
 			copy($source_less, $destination_less);
-			$less = new CubeIT_CommandLine('lessc');
-			$less->setArg('plugin', 'less-plugin-clean-css');
+			$less = new CubeIT_CommandLine('/usr/local/bin/lessc');
 			$less->setArg(null, $destination_less);
 			$less->setArg(null, $this->vdir . '/' . $destination_css);
 			$less->execute();