mirror/minify
1
0
Fork 0
mirror of https://github.com/mrclay/minify.git synced 2025-08-21 13:21:59 +02:00
Code Issues Releases Wiki Activity

Fixes #53 (github) handles division following line break

Browse Source
This commit is contained in:
Steve Clay
2013-04-01 11:25:27 -04:00
parent d67feea182
commit 6f5721d2db
9 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
min/lib/JSMin.php
View File

@@ -268,11 +268,11 @@ class JSMin {
*/ */
protected function isRegexpLiteral() protected function isRegexpLiteral()
{ {
if (false !== strpos("(,=:[!&|?+-~*\n{", $this->a)) { if (false !== strpos("(,=:[!&|?+-~*{;", $this->a)) {
// we obviously aren't dividing // we obviously aren't dividing
return true; return true;
} }
if (' ' === $this->a) { if ($this->a === ' ' || $this->a === "\n") {
$length = strlen($this->output); $length = strlen($this->output);
if ($length < 2) { // weird edge case if ($length < 2) { // weird edge case
return true; return true;

4
min_unit_tests/_test_files/js/issue256.js
View File

@@ -1,5 +1,3 @@
!function(){}(window) !function(){}(window)
!function(){}(window) !function(){}(window)
x = / [/] /;

3
min_unit_tests/_test_files/js/issue256.min.js vendored
View File

@@ -1,3 +1,2 @@
!function(){}(window) !function(){}(window)
!function(){}(window) !function(){}(window)
x=/ [/] /;

4
min_unit_tests/_test_files/js/issue74.js
View File

@@ -1,4 +0,0 @@
function testIssue74() {
return /'/;
}

1
min_unit_tests/_test_files/js/issue74.min.js vendored
View File

@@ -1 +0,0 @@
function testIssue74(){return /'/;}

1
min_unit_tests/_test_files/js/issue74.min_plus.js
View File

@@ -1 +0,0 @@
function testIssue74(){return /'/}

20
min_unit_tests/_test_files/js/regexes.js Normal file
View File

@@ -0,0 +1,20 @@
function testIssue74() {
return /'/;
}
!function(s) {
return /^[£$€?.]/.test(s);
}();
typeof
/ ' /;
x = / [/] /;
1
/ foo;
(2)
/ foo;

3
min_unit_tests/_test_files/js/regexes.min.js vendored Normal file
View File

@@ -0,0 +1,3 @@
function testIssue74(){return /'/;}
!function(s){return /^[£$€?.]/.test(s);}();typeof
/ ' /;x=/ [/] /;1/foo;(2)/foo;

6
min_unit_tests/test_JSMin.php
View File

@@ -47,10 +47,10 @@ function test_JSMin()
} }
} }
$src = file_get_contents($thisDir . '/_test_files/js/issue74.js'); $src = file_get_contents($thisDir . '/_test_files/js/regexes.js');
$minExpected = file_get_contents($thisDir . '/_test_files/js/issue74.min.js'); $minExpected = file_get_contents($thisDir . '/_test_files/js/regexes.min.js');
$minOutput = JSMin::minify($src); $minOutput = JSMin::minify($src);
assertTrue($minExpected == $minOutput, 'JSMin : Quotes in RegExp literals (Issue 74)'); assertTrue($minExpected == $minOutput, 'JSMin : Identify RegExp literals');
if (__FILE__ === realpath($_SERVER['SCRIPT_FILENAME'])) { if (__FILE__ === realpath($_SERVER['SCRIPT_FILENAME'])) {
echo "\n---Output: " .countBytes($minOutput). " bytes\n\n{$minOutput}\n\n"; echo "\n---Output: " .countBytes($minOutput). " bytes\n\n{$minOutput}\n\n";
echo "---Expected: " .countBytes($minExpected). " bytes\n\n{$minExpected}\n\n"; echo "---Expected: " .countBytes($minExpected). " bytes\n\n{$minExpected}\n\n";