projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AssetTrait.php
[Pman.Core]
/
AssetTrait.php
diff --git
a/AssetTrait.php
b/AssetTrait.php
index
75fd7b3
..
a35005b
100644
(file)
--- a/
AssetTrait.php
+++ b/
AssetTrait.php
@@
-110,9
+110,11
@@
trait Pman_Core_AssetTrait {
} else {
// echo "<!-- file already exists: {$basedir}/{$output} -->\n";
}
} else {
// echo "<!-- file already exists: {$basedir}/{$output} -->\n";
}
+
+ $asset = $ff->project == 'Pman' ? '/Pman/Asset/js' : '/Asset/js/';
//$this->arrayToJsInclude( $files);
$this->assetArrayToHtml( array(
//$this->arrayToJsInclude( $files);
$this->assetArrayToHtml( array(
- $this->baseURL.
'/Asset/js/'
. $output,
+ $this->baseURL.
$asset
. $output,
), 'js');
), 'js');