PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2025-02-20 11:54:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merged development into master

Browse source
This commit is contained in:
NelsonLaQuet 2013-09-01 02:27:19 -05:00
commit 58de67852e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/library/Assets.php
View file

@ -41,7 +41,7 @@
} }
public static function scriptAssetCollection($area) { public static function scriptAssetCollection($area) {
$coffeeScript = new CoffeeScriptFilter(Config::get('app.coffee')); $coffeeScript = new CoffeeScriptFilter(Config::get('app.coffee'), Config::get('app.node'));
if ($area == 'app') { if ($area == 'app') {
$collection = new AssetCollection([ $collection = new AssetCollection([

2
public/asset.php
View file

@ -29,7 +29,7 @@
$bundle->setTargetPath('scripts'); $bundle->setTargetPath('scripts');
} else { } else {
$filePath = trim($_GET['file'], '/'); $filePath = trim($_GET['file'], '/');
$bundle = new AssetCollection([new FileAsset($filePath)], [new CoffeeScriptFilter(Config::get('app.coffee'))]); $bundle = new AssetCollection([new FileAsset($filePath)], [new CoffeeScriptFilter(Config::get('app.coffee'), Config::get('app.node'))]);
$bundle->setTargetPath($filePath); $bundle->setTargetPath($filePath);
} }