TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes LESS parser so the paths are no longer messed up

This commit is contained in:
Sam Georges 2014-08-29 18:20:38 +10:00
parent e72c30a3c8
commit cd51c37d19
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/cms/classes/CombineAssets.php
View File

@ -75,28 +75,23 @@ class CombineAssets
$this->useMinify = Config::get('cms.enableAssetMinify', false);
/*
* Register basic JavaScript filters.
* Register JavaScript filters.
*/
$this->registerFilter('js', new \October\Rain\Support\Filters\JavascriptImporter);
/*
* Register basic CSS filters.
* Register CSS filters.
*/
$this->registerFilter('css', new \Assetic\Filter\CssImportFilter);
$this->registerFilter('css', new \Assetic\Filter\CssRewriteFilter);
/*
* Special filters
*/
$this->registerFilter('less', new \Assetic\Filter\LessphpFilter);
$this->registerFilter(['css', 'less'], new \Assetic\Filter\CssRewriteFilter);
$this->registerFilter('less', new \October\Rain\Support\Filters\LessCompiler);
/*
* Minification filters
*/
if ($this->useMinify) {
$this->registerFilter('js', new \Assetic\Filter\JSMinFilter);
$this->registerFilter('css', new \October\Rain\Support\Filters\StylesheetMinify);
$this->registerFilter('less', new \October\Rain\Support\Filters\StylesheetMinify);
$this->registerFilter(['css', 'less'], new \October\Rain\Support\Filters\StylesheetMinify);
}
}
@ -370,8 +365,15 @@ class CombineAssets
*/
public function registerFilter($extension, $filter)
{
if (is_array($extension)) {
foreach ($extension as $_extension) {
$this->registerFilter($_extension, $filter);
}
return;
}
$extension = strtolower($extension);
if (!isset($this->filters[$extension]))
$this->filters[$extension] = [];