PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-29 08:07:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merged development into master

Browse source
This commit is contained in:
NelsonLaQuet 2013-09-01 03:52:22 -05:00
commit f2d99854df
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/asset.php
View file

@ -25,7 +25,7 @@
if (!isset($_GET['file']) || !Config::get('app.debug')) { if (!isset($_GET['file']) || !Config::get('app.debug')) {
$bundle = Assets::scriptAssetCollection($_GET['area']); $bundle = Assets::scriptAssetCollection($_GET['area']);
$bundle->ensureFilter(new UglifyJs2Filter(Config::get('app.uglify-js'))); $bundle->ensureFilter(new UglifyJs2Filter(Config::get('app.uglify-js'), Config::get('app.node')));
$bundle->setTargetPath('scripts'); $bundle->setTargetPath('scripts');
} else { } else {
$filePath = trim($_GET['file'], '/'); $filePath = trim($_GET['file'], '/');
@ -39,7 +39,7 @@
if (!isset($_GET['file']) || !Config::get('app.debug')) { if (!isset($_GET['file']) || !Config::get('app.debug')) {
$bundle = Assets::styleAssetCollection($_GET['area']); $bundle = Assets::styleAssetCollection($_GET['area']);
$bundle->ensureFilter(new UglifyCssFilter(Config::get('app.uglify-css'))); $bundle->ensureFilter(new UglifyCssFilter(Config::get('app.uglify-css'), Config::get('app.node')));
$bundle->setTargetPath('styles'); $bundle->setTargetPath('styles');
} else { } else {
$filePath = trim($_GET['file'], '/'); $filePath = trim($_GET['file'], '/');