mirror of
https://github.com/Oreolek/kohana-less.git
synced 2024-07-01 05:55:07 +03:00
Compress LESS files on external compiling
This commit is contained in:
parent
716e5cf00b
commit
aaffc1b4ea
|
@ -55,7 +55,7 @@ class Less_Core
|
||||||
$config = Kohana::$config->load('less');
|
$config = Kohana::$config->load('less');
|
||||||
|
|
||||||
// if compression is allowed
|
// if compression is allowed
|
||||||
if ($config['compress'])
|
if ($config['compress'] AND $config['vendor_internal'])
|
||||||
{
|
{
|
||||||
return HTML::style(self::_combine($stylesheets), array('media' => $media));
|
return HTML::style(self::_combine($stylesheets), array('media' => $media));
|
||||||
}
|
}
|
||||||
|
@ -197,7 +197,12 @@ class Less_Core
|
||||||
exit($ex->getMessage());
|
exit($ex->getMessage());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$compiled = shell_exec('lessc ' . $filename);
|
$command ='lessc ';
|
||||||
|
if (Kohana::$config->load('less')->get('compress'))
|
||||||
|
{
|
||||||
|
$command = 'lessc --clean-css ';
|
||||||
|
}
|
||||||
|
$compiled = shell_exec($command . $filename);
|
||||||
if (is_null($compiled)) exit($compiled);
|
if (is_null($compiled)) exit($compiled);
|
||||||
$compressed = self::_compress($compiled);
|
$compressed = self::_compress($compiled);
|
||||||
file_put_contents($filename, $compressed);
|
file_put_contents($filename, $compressed);
|
||||||
|
@ -218,7 +223,12 @@ class Less_Core
|
||||||
return lessc::ccompile($original, $compiled);
|
return lessc::ccompile($original, $compiled);
|
||||||
} else {
|
} else {
|
||||||
if (!is_file($compiled) || filemtime($original) > filemtime($compiled)) {
|
if (!is_file($compiled) || filemtime($original) > filemtime($compiled)) {
|
||||||
return (int) shell_exec('lessc ' . $original . ' >' . $compiled);
|
$command ='lessc ';
|
||||||
|
if (Kohana::$config->load('less')->get('compress'))
|
||||||
|
{
|
||||||
|
$command = 'lessc --clean-css ';
|
||||||
|
}
|
||||||
|
return (int) shell_exec($command . $original . ' >' . $compiled);
|
||||||
} else {
|
} else {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue