Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-24 17:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [FIX] Fixed wrong behavior when clearing event log. Thanks to @vmario89 for the notice. Closes #1026

Browse Source 
* [MOD] Moved 3rd party resources (CSS, JS, etc) to vendor directory
* [MOD] Code refactoring
This commit is contained in:
nuxsmin
2018-08-28 01:16:40 +02:00
parent 02815f9d3c
commit 7e0785a03e
63 changed files with 67 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/modules/web/Controllers/ResourceController.php
View File

@@ -55,15 +55,16 @@ final class ResourceController extends SimpleControllerBase
->getMinified();
} else {
$this->minify->setType(Minify::FILETYPE_CSS)
->setBase(PUBLIC_PATH . DIRECTORY_SEPARATOR . 'css')
->addFiles(['reset.min.css',
->setBase(PUBLIC_PATH . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'css')
->addFiles([
'reset.min.css',
'jquery-ui.min.css',
'jquery-ui.structure.min.css',
'fonts.min.css',
'material-icons.min.css',
'toastr.min.css',
'magnific-popup.min.css'
], false)
->addFile('fonts.min.css', false, PUBLIC_PATH . DIRECTORY_SEPARATOR . 'css')
->getMinified();
}
}
@@ -83,12 +84,12 @@ final class ResourceController extends SimpleControllerBase
->addFilesFromString(urldecode($file))
->getMinified();
} else {
$this->minify->setType(Minify::FILETYPE_JS)
->setBase(PUBLIC_PATH . DIRECTORY_SEPARATOR . 'js');
$group = $this->request->analyzeInt('g', 0);
if ($group === 0) {
$this->minify->setType(Minify::FILETYPE_JS)
->setBase(PUBLIC_PATH . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'js');
$this->minify->addFiles([
'jquery-3.3.1.min.js',
'jquery-migrate-3.0.0.min.js',
@@ -105,6 +106,9 @@ final class ResourceController extends SimpleControllerBase
'jquery.magnific-popup.min.js',
'eventsource.min.js'], false);
} elseif ($group === 1) {
$this->minify->setType(Minify::FILETYPE_JS)
->setBase(PUBLIC_PATH . DIRECTORY_SEPARATOR . 'js');
// FIXME: use MIN version
$this->minify->addFiles([
'app.js',