JsTemplate.php

[Pman.Core] / JsTemplate.php

diff --git a/JsTemplate.php b/JsTemplate.php
index 17a943c..5cb87a9 100644 (file)
--- a/JsTemplate.php
+++ b/JsTemplate.php
@@ -45,12 +45,12 @@ class Pman_Core_JsTemplate extends Pman {
         // get the modules.
         header('Content-type: text/javascript');
         
-        $ff = HTML_FlexyFramework::get()->HTML_Template_Flexy;
-        
-        $ar = explode(PATH_SEPARATOR, $ff['templateDir']);
-        
+        $ff = HTML_FlexyFramework::get();
         
+        $pr = $ff->project;
+        $ar = explode(PATH_SEPARATOR, $ff->HTML_Template_Flexy['templateDir']);
         
+        $prefix = $pr == 'Pman' ? 'Pman.' : '';
         
         foreach($ar as $mod) {
             $dir =   dirname($mod) . '/jtemplates';
@@ -65,11 +65,12 @@ class Pman_Core_JsTemplate extends Pman {
                 echo '// no template is directory '. htmlspecialchars($dir) ."\n";
                 continue;
             }
-            echo "Pman.{$mn} = Pman.{$mn} || {};\n";
-            echo "Pman.{$mn}.template = Pman.{$mn}.template   || {};\n\n";
+            
+            echo "{$prefix}{$mn} = {$prefix}{$mn} || {};\n";
+            echo "{$prefix}{$mn}.template = {$prefix}{$mn}.template   || {};\n\n";
             
             foreach(glob("$dir/*.html") as $fn) {
-                $name = 'Pman.' . $mn .'.template.' . preg_replace('/\.html$/i', '', basename($fn));
+                $name = "{$prefix}{$mn}.template." . preg_replace('/\.html$/i', '', basename($fn));
                 echo $this->compile($fn, $name) . "\n";
                 
 
@@ -94,12 +95,22 @@ class Pman_Core_JsTemplate extends Pman {
         
         $contents = file_get_contents($fn);
         $ar = preg_split('/(\{[^\}]+})/', $contents, -1, PREG_SPLIT_DELIM_CAPTURE);
+        
+        
+        
+        
         //echo '<PRE>' . htmlspecialchars(print_r($ar,true));
         
-        $ret = array();
+        $out= array();
+        
+        $head = "$name = function(t)\n{\n    var ret = [];\n\n";
         
-        $ret[] = "var $name = function(t) {\n    var ret=[];\n";
+        $funcs = array();
+        // do not allow nested functions..?
+        $fstart = -1;
         $indent = 1;
+        $inscript = false;
+        $ret = &$out;
         foreach($ar as $item) {
             $in = str_repeat("    ", $indent);
             
@@ -108,13 +119,33 @@ class Pman_Core_JsTemplate extends Pman {
                 case (!strlen($item)):
                     continue;
                 
+                case ($inscript && ($item != '{end:}')):
+                    $ret[] = $item;
+                    continue;
+                
+                case ($inscript && ($item == '{end:}')):
+                    $inscript = false;
+                    continue;
+                
+                
+                case ($inscript):
+                     $ret[] = $item;
+                     continue;
+                    
                 case ($item[0] != '{'):
                     if (!strlen(trim($item))) {
                         continue;
                     }
-                    $ret[] = $in . "ret+= ". json_encode($item) . ";";
+                    $ret[] = $in . "ret += ". json_encode($item) . ";";
+                    continue;
+                
+                
+                case ($item == '{script:}'): 
+                    $inscript = true;
                     continue;
                 
+                
+                
                 case (substr($item,1,3) == 'if('):
                     $ret[] = $in . substr($item,1,-1) . ' {';
                     $indent++;
@@ -124,6 +155,10 @@ class Pman_Core_JsTemplate extends Pman {
                     $indent--;
                     $in = str_repeat("    ", $indent);
                     $ret[] = $in . "}";
+                    if ($fstart == $indent) {
+                        $fstart = -1;
+                        $ret = &$out;
+                    }
                     continue;
                 
                 case (substr($item,1,7) == 'return:'):
@@ -131,7 +166,9 @@ class Pman_Core_JsTemplate extends Pman {
                     continue;
                 
                 case (substr($item,1,9) == 'function:'):
+                    $fstart = $indent;
                     $indent++;
+                    $ret = &$funcs;
                     $def  = substr($item,10,-1) ;
                     list($name,$body) = explode('(', $def, 2);
                     
@@ -153,8 +190,8 @@ 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));
+        return $head . implode("\n",$funcs) . "\n\n" .implode("\n",$out) ;
+        //echo '<PRE>' . htmlspecialchars(implode("\n",$ret));