JsTemplate.php

[Pman.Core] / JsTemplate.php

diff --git a/JsTemplate.php b/JsTemplate.php
index 9885da9..44a1d1f 100644 (file)
--- a/JsTemplate.php
+++ b/JsTemplate.php
@@ -45,19 +45,33 @@ class Pman_Core_JsTemplate extends Pman {
         // get the modules.
         header('Content-type: text/javascript');
         
-        $ff = HTML_FlexyFramework::get()->HTML_Template_Flexy;
+        $ff = HTML_FlexyFramework::get();
         
-        $ar = explode(PATH_SEPARATOR, $ff['templateDir']);
+        $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";
                 
 
             }
@@ -83,10 +97,16 @@ class Pman_Core_JsTemplate extends Pman {
         $ar = preg_split('/(\{[^\}]+})/', $contents, -1, PREG_SPLIT_DELIM_CAPTURE);
         //echo '<PRE>' . htmlspecialchars(print_r($ar,true));
         
-        $ret = array();
+        $out= array();
+        
+        $head = "var $name = function(t) {\n    var ret=[];\n";
         
-        $ret[] = "var $name = function(t) {\n    var ret=[];\n";
+        $funcs = array();
+        // do not allow nested functions..?
+        $fstart = 0;
         $indent = 1;
+        
+        $ret = &$out;
         foreach($ar as $item) {
             $in = str_repeat("    ", $indent);
             
@@ -99,7 +119,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('):
@@ -111,6 +131,9 @@ class Pman_Core_JsTemplate extends Pman {
                     $indent--;
                     $in = str_repeat("    ", $indent);
                     $ret[] = $in . "}";
+                    if ($fstart == $indent) {
+                        $ret = &$out;
+                    }
                     continue;
                 
                 case (substr($item,1,7) == 'return:'):
@@ -118,7 +141,9 @@ class Pman_Core_JsTemplate extends Pman {
                     continue;
                 
                 case (substr($item,1,9) == 'function:'):
+                    $fstart = $indent;
                     $indent++;
+                    $ret = &$funct;
                     $def  = substr($item,10,-1) ;
                     list($name,$body) = explode('(', $def, 2);
                     
@@ -140,8 +165,8 @@ class Pman_Core_JsTemplate extends Pman {
         }
         $in = str_repeat("    ", $indent);
         $ret[] = $in .  "return ret.join('');\n}\n";
-        
-        echo '<PRE>' . htmlspecialchars(implode("\n",$ret));
+        return $head . implode("\n",$funcs) . "\n" .implode("\n",$out) ;
+        //echo '<PRE>' . htmlspecialchars(implode("\n",$ret));