JsTemplate.php

[Pman.Core] / JsTemplate.php

diff --git a/JsTemplate.php b/JsTemplate.php
index b720d0e..0e8d3bd 100644 (file)
--- a/JsTemplate.php
+++ b/JsTemplate.php
@@ -94,7 +94,7 @@ class Pman_Core_JsTemplate extends Pman {
         
         
         $contents = file_get_contents($fn);
-        $ar = preg_split('/(\{[^\}]+})/', $contents, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $ar = preg_split('/(\{[^\\n}]+})/', $contents, -1, PREG_SPLIT_DELIM_CAPTURE);
         
         
         
@@ -103,29 +103,31 @@ class Pman_Core_JsTemplate extends Pman {
         
         $out= array();
         
-        $head = "$name = function(t) {\n    var ret=[];\n";
+        $head = "$name = function(t)\n{\n    var ret = [];\n\n";
         
         $funcs = array();
         // do not allow nested functions..?
         $fstart = -1;
-        $indent = 1;
-        
+        $indent = 2;
+        $inscript = false;
         $ret = &$out;
         foreach($ar as $item) {
             $in = str_repeat("    ", $indent);
-            
+            $indent  = max($indent , 1);
             //var_Dump(substr($item,-3,2));
             switch(true) {
                 case (!strlen($item)):
                     continue;
                 
-                if ($inscript && ($item != '{end:}')) {
+                case ($inscript && ($item != '{end:}')):
                     $ret[] = $item;
-                }
-                if ($inscript && ($item == '{end:}')) {
+                    continue;
+                
+                case ($inscript && ($item == '{end:}')):
                     $inscript = false;
-                    
-                }
+                    continue;
+                 
+             
                 case ($item[0] != '{'):
                     if (!strlen(trim($item))) {
                         continue;
@@ -134,10 +136,13 @@ class Pman_Core_JsTemplate extends Pman {
                     continue;
                 
                 
-                case (substr($item,1,6) == 'script:'): 
+                case ($item == '{script:}'): 
                     $inscript = true;
                     continue;
                 
+                case ($item[1] == '!'):
+                    $ret[] = $in . substr($item,2,-1) .';';
+                    continue;
                 
                 
                 case (substr($item,1,3) == 'if('):
@@ -175,6 +180,10 @@ class Pman_Core_JsTemplate extends Pman {
                         $ret[] = $in . "ret += ".  substr($item,1,-3) . ';';
                         continue;
                     }
+                    if (substr($item,-3,2) == ':b') {
+                        $ret[] = $in . "ret += Roo.util.Format.htmlEncode(".  substr($item,1,-1).').split("\n").join("<br/>\n");';
+                        continue;
+                    }
                     $ret[] = $in . "ret += Roo.util.Format.htmlEncode(".  substr($item,1,-1).');';
                     continue;
                 
@@ -184,7 +193,7 @@ class Pman_Core_JsTemplate extends Pman {
         }
         $in = str_repeat("    ", $indent);
         $ret[] = $in .  "return ret.join('');\n}\n";
-        return $head . implode("\n",$funcs) . "\n" .implode("\n",$out) ;
+        return $head . implode("\n",$funcs) . "\n\n" .implode("\n",$out) ;
         //echo '<PRE>' . htmlspecialchars(implode("\n",$ret));