mirror/minify
1
0
Fork 0
mirror of https://github.com/mrclay/minify.git synced 2025-08-27 07:44:30 +02:00
Code Issues Releases Wiki Activity

Minify no longer tries to minify -min.js/.min.js files

Browse Source 
2.2 used empty string as a magical value meaning do not minify, but
in the refactoring `Minify::combineMinify` forgot to interpret this
value that way and instead inherited the default compressor for the type.

This eliminates `""` as a magical value, but for BC rewrites it to
`Minify::nullMinifier` in the sources.

Fixes #499
This commit is contained in:
Steve Clay
2016-02-26 11:16:16 -05:00
parent 0b466c0892
commit 7dbd2c87e4
8 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Minify.php
View File

@@ -168,7 +168,7 @@ class Minify {
* $options['minifiers'][Minify::TYPE_CSS] = 'customCssMinifier';
*
* // don't minify Javascript at all
* $options['minifiers'][Minify::TYPE_JS] = '';
* $options['minifiers'][Minify::TYPE_JS] = 'Minify::nullMinifier';
* </code>
*
* 'minifierOptions' : to send options to the minifier function, specify your options
@@ -293,7 +293,7 @@ class Minify {
$this->options['minifiers'][self::TYPE_JS] = false;
foreach ($this->sources as $key => $source) {
if ($this->options['contentType'] === self::TYPE_JS) {
$source->setMinifier("");
$source->setMinifier('Minify::nullMinifier');
} elseif ($this->options['contentType'] === self::TYPE_CSS) {
$source->setMinifier(array('Minify_CSSmin', 'minify'));
$sourceOpts = $source->getMinifierOptions();
@@ -458,6 +458,20 @@ class Minify {
exit;
}
/**
* Default minifier for .min or -min JS files.
*
* @param string $content
* @return string
*/
public static function nullMinifier($content) {
if (isset($content[0]) && $content[0] === "\xef") {
$content = substr($content, 3);
}
$content = str_replace("\r\n", "\n", $content);
return trim($content);
}
/**
* Setup CSS sources for URI rewriting
*/