DataObjects/Core_watch.php

[Pman.Core] / JsCompile.php

diff --git a/JsCompile.php b/JsCompile.php
index 6e249aa..84a609e 100644 (file)
--- a/JsCompile.php
+++ b/JsCompile.php
@@ -81,6 +81,16 @@ class Pman_Core_JsCompile  extends Pman
      *
      */
     
+    static function jsSort($a,$b)
+    {
+        $a = substr($a, 0, -3);
+        $b=  substr($b, 0, -3);
+        if ($a == $b) {
+            return 0;
+        }
+        return ($a > $b) ? +1 : -1;
+    }
+    
     
     function packScript($basedir, $files,  $output_url, $compile=true)
     {
@@ -100,14 +110,21 @@ class Pman_Core_JsCompile  extends Pman
             if (!is_dir($basedir .'/' .$f)) {
                 
                 $arfiles[$basedir .'/' .$f] = filemtime($basedir .'/' .$f);
-                 $ofiles[] = $f;
+                $ofiles[] = $f;
                 continue;
             }
+            
             foreach(glob($basedir .'/' .$f.'/*.js') as $fx) {
+                
                 $arfiles[$fx] = filemtime($fx);
                 $ofiles [] = $f . '/'. basename($fx);
             }
         }
+        $tf = 
+        // sort exc. the .js
+        usort($ofiles,create_function('$a,$b', 'return Pman_Core_JsCompile::jsSort($a,$b);'));
+        
+        //print_R($ofiles);
         
         $output = md5(serialize($arfiles)) .'.js';