projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8c83b51
)
AssetTrait.php
author
Alan Knowles
<alan@roojs.com>
Mon, 18 Jan 2016 06:05:28 +0000
(14:05 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 18 Jan 2016 06:05:28 +0000
(14:05 +0800)
AssetTrait.php
patch
|
blob
|
history
diff --git
a/AssetTrait.php
b/AssetTrait.php
index
176361f
..
9c492a1
100644
(file)
--- a/
AssetTrait.php
+++ b/
AssetTrait.php
@@
-240,7
+240,7
@@
trait Pman_Core_AssetTrait {
$output = date('Y-m-d-H-i-s-', $maxtime). $smod .'-'.md5(serialize($arfiles)) .'.css';
$output = date('Y-m-d-H-i-s-', $maxtime). $smod .'-'.md5(serialize($arfiles)) .'.css';
-
+ $asset = $ff->project == 'Pman' ? '/Core/Asset/css/' : '/Asset/css/';
// where are we going to write all of this..
// This has to be done via a
// where are we going to write all of this..
// This has to be done via a
@@
-251,7
+251,7
@@
trait Pman_Core_AssetTrait {
require_once 'HTML/CSS/Minify.php';
$x = new HTML_CSS_Minify(substr($relpath,0,-1), $dir, $relfiles);
require_once 'HTML/CSS/Minify.php';
$x = new HTML_CSS_Minify(substr($relpath,0,-1), $dir, $relfiles);
- file_put_contents($compiledir.'/'.$output , $x->minify( $this->baseURL.
'/Asset/css'
));
+ file_put_contents($compiledir.'/'.$output , $x->minify( $this->baseURL.
$asset
));
clearstatcache();
if (!file_exists($compiledir.'/'.$output) ||
!filesize($compiledir.'/'.$routput)) {
clearstatcache();
if (!file_exists($compiledir.'/'.$output) ||
!filesize($compiledir.'/'.$routput)) {
@@
-264,7
+264,7
@@
trait Pman_Core_AssetTrait {
// echo "<!-- file already exists: {$basedir}/{$output} -->\n";
}
// echo "<!-- file already exists: {$basedir}/{$output} -->\n";
}
- $asset = $ff->project == 'Pman' ? '/Core/Asset/css/' : '/Asset/css/';
+
//$this->arrayToJsInclude( $files);
$this->assetArrayToHtml( array(
$this->baseURL.$asset. $output,
//$this->arrayToJsInclude( $files);
$this->assetArrayToHtml( array(
$this->baseURL.$asset. $output,