JsTemplate.php

[Pman.Core] / JsTemplate.php

diff --git a/JsTemplate.php b/JsTemplate.php
index b19c87f..c3b75d6 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,13 +103,13 @@ 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;
-        
+        $inscript = false;
         $ret = &$out;
         foreach($ar as $item) {
             $in = str_repeat("    ", $indent);
@@ -119,10 +119,15 @@ class Pman_Core_JsTemplate extends Pman {
                 case (!strlen($item)):
                     continue;
                 
-                if ($inscript && ($item != '{end:}') {
+                case ($inscript && ($item != '{end:}')):
                     $ret[] = $item;
-                }
+                    continue;
                 
+                case ($inscript && ($item == '{end:}')):
+                    $inscript = false;
+                    continue;
+                 
+             
                 case ($item[0] != '{'):
                     if (!strlen(trim($item))) {
                         continue;
@@ -131,11 +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 . "$item;";
+                    continue;
                 
                 case (substr($item,1,3) == 'if('):
                     $ret[] = $in . substr($item,1,-1) . ' {';
@@ -181,7 +188,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));