JsTemplate.php

[Pman.Core] / JsTemplate.php

diff --git a/JsTemplate.php b/JsTemplate.php
index ef20a26..6921d32 100644 (file)
--- a/JsTemplate.php
+++ b/JsTemplate.php
@@ -45,18 +45,33 @@ class Pman_Core_JsTemplate extends Pman {
         // get the modules.
         header('Content-type: text/javascript');
         
-        $ff = HTML_FlexyFramework::get()->HTML_Template_Flexy;
-        print_R($ff);
+        $ff = HTML_FlexyFramework::get();
         
-        $mods = $this->modulesList();
-        foreach($mods as $mod) {
-            $dir =   $this->rootDir.'/Pman/'. $mod . '/jtemplates';
+        $pr = $ff->project;
+        $ar = explode(PATH_SEPARATOR, $ff->HTML_Template_Flexy['templateDir']);
+        
+        $prefix = $pr == 'Pman' ? 'Pman.' : '';
+        
+        foreach($ar as $mod) {
+            $dir =   dirname($mod) . '/jtemplates';
             if (!file_exists($dir)) {
                 echo '// missing directory '. htmlspecialchars($dir) ."\n";
+                continue;
             }
             // got a directory..
+            $mn = basename(dirname($mod));
+            $ar = glob("$dir/*.html") ;
+            if (empty($ar)) {
+                echo '// no template is directory '. htmlspecialchars($dir) ."\n";
+                continue;
+            }
+            
+            echo "{$prefix}{$mn} = {$prefix}{$mn} || {};\n";
+            echo "{$prefix}{$mn}.template = {$prefix}{$mn}.template   || {};\n\n";
+            
             foreach(glob("$dir/*.html") as $fn) {
-                var_Dump($fn);
+                $name = "{$prefix}{$mn}.template." . preg_replace('/\.html$/i', '', basename($fn));
+                echo $this->compile($fn, $name) . "\n";
                 
 
             }
@@ -98,7 +113,7 @@ class Pman_Core_JsTemplate extends Pman {
                     if (!strlen(trim($item))) {
                         continue;
                     }
-                    $ret[] = $in . "ret+= ". json_encode($item) . ";";
+                    $ret[] = $in . "ret += ". json_encode($item) . ";";
                     continue;
                 
                 case (substr($item,1,3) == 'if('):
@@ -139,7 +154,7 @@ class Pman_Core_JsTemplate extends Pman {
         }
         $in = str_repeat("    ", $indent);
         $ret[] = $in .  "return ret.join('');\n}\n";
-        
+        return implode("\n",$ret);
         echo '<PRE>' . htmlspecialchars(implode("\n",$ret));