X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=AssetTrait.php;h=0067d6f28c14602bb310876548b6b0e6c7ba3661;hb=refs%2Fheads%2Fmaster;hp=38dee0ffbb575775efd31c661c6fc7905a601a61;hpb=42135b770db0b6aa7e1149a9d48f5e10c6cb6144;p=Pman.Core

diff --git a/AssetTrait.php b/AssetTrait.php
index 38dee0ff..0067d6f2 100644
--- a/AssetTrait.php
+++ b/AssetTrait.php
@@ -78,8 +78,8 @@ trait Pman_Core_AssetTrait {
         
         $ff = HTML_FlexyFramework::get();
         
-        if (!empty($ff->Pman['isDev']) && !empty($_REQUEST['isDev'])) {
-            echo "<!-- Javascript compile turned off (isDev on) -->\n";
+        if (empty($compiledir) || (!empty($ff->Pman['isDev']) && !empty($_REQUEST['isDev']))) {
+            echo "<!-- Javascript compile turned off (isDev on or mkdir failed) -->\n";
             $this->assetArrayToHtml($files,'js');
             return;
         }
@@ -286,7 +286,7 @@ trait Pman_Core_AssetTrait {
         // we cant output non-cached versions of this....
         
         // this doesnt really look like it would work!
-        $this->outputCSSDir("{$this->rootDir}/Pman/{$smod}/scss/{$smod}.scss", $smod);
+        $this->outputSCSSDir("{$this->rootDir}/Pman/{$smod}/scss/{$smod}.scss", $smod);
         
     }
     /*
@@ -308,6 +308,8 @@ trait Pman_Core_AssetTrait {
     
     function outputSCSSDir($file, $smod= '')
     {
+        
+         
         $ff = HTML_FlexyFramework::get();
         $asset = $ff->project == 'Pman' ? '/Core/Asset/css/' : '/Asset/css/';
         
@@ -319,7 +321,7 @@ trait Pman_Core_AssetTrait {
         $ar = glob(dirname($file). '/*.scss');
         $maxtime = filemtime($file);
         foreach($ar as $fn) {
-            $maxtime=max($maxtime, filemtime($fn));
+            $maxtime= max($maxtime, filemtime($fn));
         }