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

Coding style

This commit is contained in:
Thomas Gelf 2014-03-31 16:30:27 +00:00
parent 9b79a8280f
commit 056b8d5395
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,10 +5,6 @@ namespace Icinga\Web;
use Icinga\Application\Icinga;
use JShrink\Minifier;
// @codingStandardsIgnoreStart
require_once ICINGA_LIBDIR . '/vendor/JShrink/Minifier.php';
// @codingStandardsIgnoreStop
class JavaScript
{
protected static $jsFiles = array(
@ -68,7 +64,7 @@ class JavaScript
}
foreach (self::$jsFiles as $file) {
$js .= file_get_contents($basedir . '/' . $file);
$js .= file_get_contents($basedir . '/' . $file);
}
foreach (Icinga::app()->getModuleManager()->getLoadedModules() as $name => $module) {
@ -77,6 +73,7 @@ class JavaScript
}
}
if ($minified) {
require_once ICINGA_LIBDIR . '/vendor/JShrink/Minifier.php';
$out .= Minifier::minify($js, array('flaggedComments' => false));
} else {
$out .= $js;

4
library/Icinga/Web/StyleSheet.php
View File

@ -27,7 +27,7 @@ class StyleSheet
$less = new LessCompiler();
$basedir = Icinga::app()->getBootstrapDirecory();
foreach (self::$lessFiles as $file) {
$less->addFile($basedir . '/' . $file);
$less->addFile($basedir . '/' . $file);
}
$less->addLoadedModules();
$less->addFile($basedir . '/css/pdf/pdfprint.less');
@ -53,7 +53,7 @@ class StyleSheet
$less = new LessCompiler();
$basedir = Icinga::app()->getBootstrapDirecory();
foreach (self::$lessFiles as $file) {
$less->addFile($basedir . '/' . $file);
$less->addFile($basedir . '/' . $file);
}
$less->addLoadedModules();
if ($minified) {