X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=JsTemplate.php;h=ec79d0c46fb0644ceb5325a04a2e02c1e6b234da;hp=67f0e2aca32b7a5e08e1605fbb8e2b9e00b7f8d8;hb=HEAD;hpb=cac957901e334ad6620af4da98e2ff3203e7f4eb

diff --git a/JsTemplate.php b/JsTemplate.php
index 67f0e2ac..302b1c6d 100644
--- a/JsTemplate.php
+++ b/JsTemplate.php
@@ -40,8 +40,10 @@ class Pman_Core_JsTemplate extends Pman {
          
     }
      
-    function get()
+    function get($v, $opts=array())
     {
+        
+        $this->sessionState(0);
         // get the modules.
         header('Content-type: text/javascript');
         
@@ -63,7 +65,7 @@ class Pman_Core_JsTemplate extends Pman {
          
             $dir =  $this->rootDir .'/'.$pdir .  $mod . '/jtemplates';
             if (!file_exists($dir)) {
-                echo '// missing directory '. htmlspecialchars($dir) ."\n";
+                //echo '// missing directory '. htmlspecialchars($dir) ."\n";
                 continue;
             }
             // got a directory..
@@ -111,7 +113,7 @@ class Pman_Core_JsTemplate extends Pman {
         
         $out= array();
         
-        $head = "$name = function(t)\n{\n    var ret = [];\n\n";
+        $head = "$name = function(t)\n{\n    var ret = '';\n\n";
         
         $funcs = array();
         // do not allow nested functions..?
@@ -125,46 +127,46 @@ class Pman_Core_JsTemplate extends Pman {
             //var_Dump(substr($item,-3,2));
             switch(true) {
                 case (!strlen($item)):
-                    continue;
+                    continue 2;
                 
                 case ($inscript && ($item != '{end:}')):
                     $ret[count($ret)-1] .= $item;
-                    continue;
+                    continue 2;
                 
                 case ($inscript && ($item == '{end:}')):
                     $inscript = false;
-                    continue;
+                    continue 2;
                  
              
                 case ($item[0] != '{'):
                     if (!strlen(trim($item))) {
-                        continue;
+                        continue 2;
                     }
                     $ret[] = $in . "ret += ". json_encode($item) . ";";
-                    continue;
+                    continue 2;
                 
                 
                 case ($item == '{script:}'): 
                     $inscript = true;
                      $ret[] = '';
-                    continue;
+                    continue 2;
                 
                 case ($item[1] == '!'):
                     $ret[] = $in . substr($item,2,-1) .';';
-                    continue;
+                    continue 2;
                 
                 
                 case (substr($item,1,3) == 'if('):
                     $ret[] = $in . substr($item,1,-1) . ' {';
                     $indent++;
-                    continue;
+                    continue 2;
                 
                 case (substr($item,1,5) == 'else:'):
                     $indent--;
                     $in = str_repeat("    ", $indent);
                     $ret[] = $in . "} else { ";
                     $indent++;
-                    continue;
+                    continue 2;
                  
                 case (substr($item,1,4) == 'end:'):
                     $indent--;
@@ -174,11 +176,11 @@ class Pman_Core_JsTemplate extends Pman {
                         $fstart = -1;
                         $ret = &$out;
                     }
-                    continue;
+                    continue 2;
                 
                 case (substr($item,1,7) == 'return:'):
                     $ret[] = $in . "return;";
-                    continue;
+                    continue 2;
                 
                 case (substr($item,1,9) == 'function:'):
                     $fstart = $indent;
@@ -189,19 +191,19 @@ class Pman_Core_JsTemplate extends Pman {
                     
                     
                     $ret[] = $in . "var $name = function (" .  $body  . '{';
-                    continue;
+                    continue 2;
                 
                 default:
                     if (substr($item,-3,2) == ':h') {
                         $ret[] = $in . "ret += ".  substr($item,1,-3) . ';';
-                        continue;
+                        continue 2;
                     }
                     if (substr($item,-3,2) == ':b') {
                         $ret[] = $in . "ret += Roo.util.Format.htmlEncode(".  substr($item,1,-3).').split("\n").join("<br/>\n");';
-                        continue;
+                        continue 2;
                     }
                     $ret[] = $in . "ret += Roo.util.Format.htmlEncode(".  substr($item,1,-1).');';
-                    continue;
+                    continue 2;
                 
             }