Merge pull request #903 from LarsGit223/master

Fixed unrecognized regular expressions behind '&&' or '||' operators in JavaScript compression. Finally fixes #897.

1 files changed, 18 insertions, 0 deletions

diff --git a/_test/tests/lib/exe/js_js_compress.test.php b/_test/tests/lib/exe/js_js_compress.test.php
index 78e089d89..648ede07e 100644
--- a/_test/tests/lib/exe/js_js_compress.test.php
+++ b/_test/tests/lib/exe/js_js_compress.test.php
@@ -58,6 +58,18 @@ class js_js_compress_test extends DokuWikiTest {
         $this->assertEquals(js_compress($text), 'text.replace(/"/,"//")');
     }
 
+    function test_regex_after_and_with_slashes_outside_string(){
+        $text = 'if ( peng == bla && /pattern\//.test(url)) request = new Something();';
+        $this->assertEquals(js_compress($text),
+                            'if(peng==bla&&/pattern\//.test(url))request=new Something();');
+    }
+
+    function test_regex_after_or_with_slashes_outside_string(){
+        $text = 'if ( peng == bla || /pattern\//.test(url)) request = new Something();';
+        $this->assertEquals(js_compress($text),
+                            'if(peng==bla||/pattern\//.test(url))request=new Something();');
+    }
+
     function test_dquot1(){
         $text = 'var foo="Now what \\" \'do we//get /*here*/ ?";';
         $this->assertEquals(js_compress($text), $text);
@@ -205,6 +217,12 @@ EOF;
         $this->assertEquals('a=5++-b;',js_compress($text));
     }
 
+    function test_unusual_signs(){
+        $text='var π = Math.PI, τ = 2 * π, halfπ = π / 2, ε = 1e-6, ε2 = ε * ε, radians = π / 180, degrees = 180 / π;';
+        $this->assertEquals(js_compress($text),
+                            'var π=Math.PI,τ=2*π,halfπ=π/2,ε=1e-6,ε2=ε*ε,radians=π/180,degrees=180/π;');
+    }
+
     /**
      * Test the files provided with the original JsStrip
      */