DataObjects/Core_domain.php

[Pman.Core] / AssetTrait.php

diff --git a/AssetTrait.php b/AssetTrait.php
index 9c492a1..3e31ee5 100644 (file)
--- a/AssetTrait.php
+++ b/AssetTrait.php
@@ -78,8 +78,9 @@ trait Pman_Core_AssetTrait {
         $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
         usort($files, $lsort);
         
+        $ff = HTML_FlexyFramework::get();
         
-        if (!empty($this->bootLoader->isDev) && !empty($_REQUEST['isDev'])) {
+        if (!empty($ff->Pman['isDev']) && !empty($_REQUEST['isDev'])) {
             echo "<!-- Javascript compile turned off (isDev on) -->\n";
             $this->assetArrayToHtml($files,'js');
             return;
@@ -224,12 +225,17 @@ trait Pman_Core_AssetTrait {
         }
         
          
-        // no sorting???
-        //$lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
-        //usort($files, $lsort);
         
         
-        if (!empty($this->bootLoader->isDev) && !empty($_REQUEST['isDev'])) {
+        // yes sort... if includes are used - they have to be in the first file...
+        $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
+        usort($files, $lsort);
+        usort($relfiles,$lsort);
+       // print_R($relfiles);
+        
+        $ff = HTML_FlexyFramework::get();
+        
+        if (!empty($ff->Pman['isDev']) && !empty($_REQUEST['isDev'])) {
             echo "<!-- CSS compile turned off (isDev on) -->\n";
             $this->assetArrayToHtml($files,'css');
             return;
@@ -238,15 +244,15 @@ trait Pman_Core_AssetTrait {
         
         $smod = str_replace('/','.',$path);
         
-        $output = date('Y-m-d-H-i-s-', $maxtime). $smod .'-'.md5(serialize($arfiles)) .'.css';
+        $output = date('Y-m-d-H-i-s-', $maxtime). $smod .'-'.md5(serialize(array($this->baseURL, $arfiles))) .'.css';
          
-         $asset = $ff->project == 'Pman' ? '/Core/Asset/css/' : '/Asset/css/';
+        $asset = $ff->project == 'Pman' ? '/Core/Asset/css/' : '/Asset/css/';
         
         // where are we going to write all of this..
         // This has to be done via a 
-        if (true || !file_exists($compiledir.'/'.$output) || !filesize($compiledir.'/'.$output)) {
-            
+        if ( !file_exists($compiledir.'/'.$output) || !filesize($compiledir.'/'.$output)) {
             
+            //print_r($relfiles);
             
             require_once 'HTML/CSS/Minify.php';
             $x = new HTML_CSS_Minify(substr($relpath,0,-1), $dir, $relfiles);