X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=AssetTrait.php;h=5199ef26bbea0c6a1d3e637831ecf435b16f7471;hp=1d186aadfc21fe3f0d5310541cc1224dd94b7b33;hb=443623f47935eb52acd65a3ff0d84eab1fd5a98b;hpb=fddbbc359376def618b73c38649425edf7e49c23 diff --git a/AssetTrait.php b/AssetTrait.php index 1d186aad..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..'