tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 00:04:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle non .js files in asset/js and non .css or .less in asset/css folder

Browse Source 
Non javascript files in asset/js folder or non css or less files in asset/css folder causes minfier to throw error. This is handled here.
This commit is contained in:
Ravi Kumar Kempapura Srinivasa 2021-10-08 16:05:49 +02:00 committed by Johannes Meyer
parent 8a5251a3a1
commit 685f1f90bc
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/Icinga/Application/Libraries/Library.php
View File

@ -221,7 +221,7 @@ class Library
$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator( $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(
$dir, $dir,
RecursiveDirectoryIterator::CURRENT_AS_PATHNAME | RecursiveDirectoryIterator::SKIP_DOTS RecursiveDirectoryIterator::CURRENT_AS_FILEINFO | RecursiveDirectoryIterator::SKIP_DOTS
)); ));
if ($type === 'static') { if ($type === 'static') {
return $iterator; return $iterator;
@ -230,7 +230,15 @@ class Library
return new CallbackFilterIterator( return new CallbackFilterIterator(
$iterator, $iterator,
function ($path) use ($type) { function ($path) use ($type) {
return substr($path, -5 - strlen($type)) !== ".min.$type"; if ($type === 'js' && $path->getExtension() === 'js') {
return substr($path->getPathname(), -5 - strlen($type)) !== ".min.$type";
} elseif ($type === 'css'
&& ($path->getExtension() === 'css' || $path->getExtension() === 'less')
) {
return substr($path->getPathname(), -5 - strlen($type)) !== ".min.$type";
}
return false;
} }
); );
}; };