JsTemplate.php

[Pman.Core] / JsTemplate.php

diff --git a/JsTemplate.php b/JsTemplate.php
index 17078ef..0e8d3bd 100644 (file)
--- a/JsTemplate.php
+++ b/JsTemplate.php
@@ -108,12 +108,12 @@ class Pman_Core_JsTemplate extends Pman {
         $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)):
@@ -141,9 +141,10 @@ class Pman_Core_JsTemplate extends Pman {
                     continue;
                 
                 case ($item[1] == '!'):
-                    $ret[] = $in . "$item;";
+                    $ret[] = $in . substr($item,2,-1) .';';
                     continue;
                 
+                
                 case (substr($item,1,3) == 'if('):
                     $ret[] = $in . substr($item,1,-1) . ' {';
                     $indent++;
@@ -179,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;