sync

[Pman.Core] / AssetTrait.php

diff --git a/AssetTrait.php b/AssetTrait.php
index cadc2cc..b05bbd4 100644 (file)
--- a/AssetTrait.php
+++ b/AssetTrait.php
@@ -54,6 +54,9 @@ trait Pman_Core_AssetTrait {
         $mtime = 0;
         foreach($ar as $fn) {
             $f = basename($fn);
+            if (!preg_match('/\.js$/', $f)) { // only javascript files... (so XXX.Dialog.YYY*  works..)
+                continue;
+            }
             // got the 'module file..'
             $mtime = filemtime($dir . '/'. $f);
             $maxtime = max($mtime, $maxtime);
@@ -236,7 +239,9 @@ trait Pman_Core_AssetTrait {
         
         $ff = HTML_FlexyFramework::get();
         
-        if (!empty($ff->Pman['isDev']) && !empty($_REQUEST['isDev'])) {
+        // isDev set
+        
+        if ((!empty($ff->Pman['isDev']) || $_SERVER['HTTP_HOST'] == 'localhost' )&& !empty($_REQUEST['isDev'])) {
             echo "<!-- CSS compile turned off (isDev on) -->\n";
             $this->assetArrayToHtml($files,'css');
             return;