projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more quote identeiifers fixessss
[Pman.Core]
/
AssetTrait.php
diff --git
a/AssetTrait.php
b/AssetTrait.php
index
1da502c
..
5199ef2
100644
(file)
--- a/
AssetTrait.php
+++ b/
AssetTrait.php
@@
-32,7
+32,9
@@
trait Pman_Core_AssetTrait {
$ar = array_merge($ar , glob($dir . '/'. $f));
continue;
}
$ar = array_merge($ar , glob($dir . '/'. $f));
continue;
}
-
+ if (!preg_match('/\.js$/', $f)) {
+ $f .= ".js";
+ }
$ar[] = $dir .'/'. $f;
}
$ar[] = $dir .'/'. $f;
}
@@
-54,7
+56,7
@@
trait Pman_Core_AssetTrait {
$mtime = 0;
foreach($ar as $fn) {
$f = basename($fn);
$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..'
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..
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);
//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)) {
if (!file_exists($compiledir)) {