fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-28 23:03:25 +09:00
Code Issues Projects Releases Packages Wiki Activity

Add unit tests for concatCSS() and concatJS()

Browse source
This commit is contained in:
Kijin Sung 2016-05-05 13:45:57 +09:00
parent 7363f71d4a
commit b5a10e850f
10 changed files with 120 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/framework/formatter.php
View file

@ -337,7 +337,7 @@ class Formatter
unset($path_converter);
if ($media !== null)
{
$content = "@media $media {\n\n$content\n\n}";
$content = "@media $media {\n\n" . trim($content) . "\n\n}";
}
$original_filename = starts_with(\RX_BASEDIR, $filename) ? substr($filename, strlen(\RX_BASEDIR)) : $filename;
$result .= '/* Original file: ' . $original_filename . ' */' . "\n\n" . trim($content) . "\n\n";
@ -374,7 +374,7 @@ class Formatter
$content = utf8_clean(file_get_contents($filename));
if ($targetie !== null)
{
$content = 'if (' . self::convertIECondition($targetie) . ') {' . "\n\n" . $content . "\n\n" . '}';
$content = 'if (' . self::convertIECondition($targetie) . ') {' . "\n\n" . trim($content) . ";\n\n" . '}';
}
$original_filename = starts_with(\RX_BASEDIR, $filename) ? substr($filename, strlen(\RX_BASEDIR)) : $filename;
$result .= '/* Original file: ' . $original_filename . ' */' . "\n\n" . trim($content) . ";\n\n";