tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JavaScript: Ensure that `$baseFiles` are loaded first if minified

This commit is contained in:
Johannes Meyer 2021-03-03 08:42:48 +01:00
parent b4531b6b45
commit 59e6ec4035
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/Icinga/Web/JavaScript.php
View File

@ -153,8 +153,9 @@ class JavaScript
$out .= ';' . ltrim(trim(file_get_contents($file)), ';') . "\n"; $out .= ';' . ltrim(trim(file_get_contents($file)), ';') . "\n";
} }
$baseJs = '';
foreach ($baseFiles as $file) { foreach ($baseFiles as $file) {
$js .= file_get_contents($file) . "\n\n\n"; $baseJs .= file_get_contents($file) . "\n\n\n";
} }
if (! $forIe11) { if (! $forIe11) {
@ -202,9 +203,11 @@ class JavaScript
if ($minified) { if ($minified) {
require_once 'JShrink/Minifier.php'; require_once 'JShrink/Minifier.php';
$out .= Minifier::minify($js, array('flaggedComments' => false)); $out .= Minifier::minify($js, ['flaggedComments' => false]);
$baseOut = Minifier::minify($baseJs, ['flaggedComments' => false]);
$out = ';' . ltrim($baseOut, ';') . "\n" . $out;
} else { } else {
$out .= $js; $out = $baseJs . $out . $js;
} }
$cache->store($cacheFile, $out); $cache->store($cacheFile, $out);