Correctly handle multiline strings in JS compressor

See http://stackoverflow.com/questions/805107/how-to-create-multiline-strings for info on them.
corretge · May 4, 2012 · ca53ac9 · ca53ac9
1 parent 55ce110
commit ca53ac9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/_test/tests/lib/exe/js_js_compress.test.php b/_test/tests/lib/exe/js_js_compress.test.php
@@ -110,6 +110,17 @@ function test_complexminified(){
         $this->assertEquals(js_compress($text),$text);
     }
 
+    function test_multilinestring(){
+        $text = 'var foo = "this is a \\
+multiline string";';
+        $this->assertEquals('var foo="this is a multiline string";',js_compress($text));
+
+        $text = "var foo = 'this is a \\
+multiline string';";
+        $this->assertEquals("var foo='this is a multiline string';",js_compress($text));
+    }
+
+
     /**
      * Test the files provided with the original JsStrip
      */

diff --git a/lib/exe/js.php b/lib/exe/js.php
@@ -307,7 +307,10 @@ function js_compress($s){
                     $j += 1;
                 }
             }
-            $result .= substr($s,$i,$j+1);
+            $string  = substr($s,$i,$j+1);
+            // remove multiline markers:
+            $string  = str_replace("\\\n",'',$string);
+            $result .= $string;
             $i = $i + $j + 1;
             continue;
         }
@@ -322,7 +325,10 @@ function js_compress($s){
                     $j += 1;
                 }
             }
-            $result .= substr($s,$i,$j+1);
+            $string = substr($s,$i,$j+1);
+            // remove multiline markers:
+            $string  = str_replace("\\\n",'',$string);
+            $result .= $string;
             $i = $i + $j + 1;
             continue;
         }