projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fef2918
)
AssetTrait.php
author
Alan Knowles
<alan@roojs.com>
Wed, 16 Dec 2020 06:48:37 +0000
(14:48 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 16 Dec 2020 06:48:37 +0000
(14:48 +0800)
AssetTrait.php
patch
|
blob
|
history
diff --git
a/AssetTrait.php
b/AssetTrait.php
index
828bade
..
c6ca8fb
100644
(file)
--- a/
AssetTrait.php
+++ b/
AssetTrait.php
@@
-339,25
+339,15
@@
trait Pman_Core_AssetTrait {
$cmd = "{$sassc} --style=compressed --sourcemap=auto -I {$fd} -I {$this->rootDir}/roojs1/scss/bootstrap $smod.scss {$compiledir}/{$output}";
$cmd = "{$sassc} --style=compressed --sourcemap=auto -I {$fd} -I {$this->rootDir}/roojs1/scss/bootstrap $smod.scss {$compiledir}/{$output}";
- echo "$cmd\n";
- echo `$cmd`;
-
- exit;
+ //echo "$cmd\n"; echo `$cmd`;
+ `$cmd`;
- //print_r($relfiles);
-
- require_once 'HTML/SCSS.php';
-
- 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));
clearstatcache();
if (!file_exists($compiledir.'/'.$output) ||
!filesize($compiledir.'/'.$routput)) {
echo "<!-- compile did not generate files : " . basename($compiledir) . "/{$output} -->\n";
clearstatcache();
if (!file_exists($compiledir.'/'.$output) ||
!filesize($compiledir.'/'.$routput)) {
echo "<!-- compile did not generate files : " . basename($compiledir) . "/{$output} -->\n";
-
$this->assetArrayToHtml($files,'css')
;
+
echo "<script type=\"text/javascript\">alert('Failed to compile {$fp}');</script>\n"
;
return;
}
return;
}
@@
-370,7
+360,7
@@
trait Pman_Core_AssetTrait {
$this->assetArrayToHtml( array(
$this->baseURL.$asset. $output,
$this->assetArrayToHtml( array(
$this->baseURL.$asset. $output,
- ),'css');
+ ),'
s
css');
}
}