]> _ Git - cubeextranet.git/commitdiff
#1735
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Fri, 6 Oct 2017 16:20:24 +0000 (16:20 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Fri, 6 Oct 2017 16:20:24 +0000 (16:20 +0000)
inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php

index f5a4b96a776c569436f4e93a548e23a835382976..2980573f4da8bbc16da24676d9cf443d4e573835 100644 (file)
@@ -880,7 +880,7 @@ class wsHTML5Compiler {
                        }
 
                        if ($reminimize) {
-                               $js = 'var files=' . json_encode($files) . ';';
+                               $js = '';
                                foreach ($files as $file) {
                                        $js .= file_get_contents($this->assets . '/' . $file);
                                        $js .= ";\n\n";
@@ -888,8 +888,7 @@ 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);