Revert "[jan] Fix calling UglifyJS compressor."

This reverts commit 4000caa. This code is correct, since the driver was written to support the most recent (and only non-deprecated current) version of Uglifyjs
horde · Dec 15, 2014 · 8e48d6b · 8e48d6b
1 parent 56c03a6
commit 8e48d6b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/framework/JavascriptMinify/lib/Horde/JavascriptMinify/Uglifyjs.php b/framework/JavascriptMinify/lib/Horde/JavascriptMinify/Uglifyjs.php
@@ -52,8 +52,14 @@ public function minify()
             return parent::minify();
         }
 
-        $cmd = escapeshellcmd($this->_opts['uglifyjs'])
-            . ' ' . $this->_opts['cmdline'];
+        $cmd = escapeshellcmd($this->_opts['uglifyjs']);
+        if (isset($this->_opts['sourcemap']) && is_array($this->_data)) {
+            $this->_sourcemap = Horde_Util::getTempFile();
+            $cmd .= ' --source-map ' .
+                escapeshellarg($this->_sourcemap) .
+                ' --source-map-url ' .
+                escapeshellarg($this->_opts['sourcemap']);
+        }
 
         if (is_array($this->_data)) {
             $js = '';
@@ -67,7 +73,7 @@ public function minify()
         $cmdline = new Horde_JavascriptMinify_Util_Cmdline();
         return $cmdline->runCmd(
             $js,
-            trim($cmd),
+            trim($cmd . ' ' . $this->_opts['cmdline']),
             $this->_opts['logger']
         ) . $this->_sourceUrls();
     }

diff --git a/framework/JavascriptMinify/package.xml b/framework/JavascriptMinify/package.xml
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* [jan] Fix calling UglifyJS compressor.
+* 
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -146,7 +146,7 @@
    <date>2014-12-03</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* [jan] Fix calling UglifyJS compressor.
+* 
    </notes>
   </release>
  </changelog>