X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=AssetTrait.php;h=5199ef26bbea0c6a1d3e637831ecf435b16f7471;hp=1da502c058ea7b6be2403fea2bd8d30527c10310;hb=443623f47935eb52acd65a3ff0d84eab1fd5a98b;hpb=f0d8584e9c086144f18a8a23aa8d46f7dbad33d9

diff --git a/AssetTrait.php b/AssetTrait.php
index 1da502c0..5199ef26 100644
--- a/AssetTrait.php
+++ b/AssetTrait.php
@@ -32,7 +32,9 @@ trait Pman_Core_AssetTrait {
                     $ar = array_merge($ar ,  glob($dir . '/'. $f));
                     continue;
                 }
-                
+                if (!preg_match('/\.js$/', $f)) {
+                    $f .= ".js";
+                }
                 $ar[] = $dir .'/'. $f;
             }
           
@@ -54,7 +56,7 @@ 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..)
+            if (!preg_match('/\.js$/', $f) || $fn == '.js' || !file_exists($dir . '/' . $f)) { // only javascript files... (so XXX.Dialog.YYY*  works..)
                 continue;
             }
             // got the 'module file..'
@@ -66,8 +68,8 @@ trait Pman_Core_AssetTrait {
         
         ksort($arfiles); // just sort by name so it's consistant for serialize..
         
-        require_once 'Pman/Asset.php';
-        $compiledir = Pman_Asset::getCompileDir('js', '', true);
+        require_once 'Pman/Core/Asset.php';
+        $compiledir = Pman_Core_Asset::getCompileDir('js', '', true);
         
          
         
@@ -211,8 +213,8 @@ trait Pman_Core_AssetTrait {
          
         //print_r($relfiles);
       
-        require_once 'Pman/Asset.php';
-        $compiledir = Pman_Asset::getCompileDir('css', '', true);
+        require_once 'Pman/Core/Asset.php';
+        $compiledir = Pman_Core_Asset::getCompileDir('css', '', true);
         
          
         if (!file_exists($compiledir)) {