X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JsTemplate.php;h=f1387913c57aa7251c3a593c07d4f5afd314b684;hb=b341a92085a9d4a5cfb1d2043e599420472aa6c8;hp=dfda8edfca20ca1df56a107de35b440db8e7d1b0;hpb=99888a4a27e179f2dbc3d3a8b44aab48b6139d6b;p=Pman.Core

diff --git a/JsTemplate.php b/JsTemplate.php
index dfda8edf..f1387913 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');
         
@@ -57,7 +59,8 @@ class Pman_Core_JsTemplate extends Pman {
         
         foreach($mods as $mod )
         {
-            $prefix = $mod == $pr  ?  "{$pr}." : "{$pr}.{$mod}.";
+            $prefix = $mod == $pr  ?  "" : "{$pr}.";
+            //var_dump($prefix);
             $pdir = $mod == $pr  ? '' : ($pr .'/') ;
          
             $dir =  $this->rootDir .'/'.$pdir .  $mod . '/jtemplates';
@@ -66,18 +69,18 @@ class Pman_Core_JsTemplate extends Pman {
                 continue;
             }
             // got a directory..
-            $mn = basename(dirname($mod));
+             
             $ar = glob("$dir/*.html") ;
             if (empty($ar)) {
                 echo '// no template is directory '. htmlspecialchars($dir) ."\n";
                 continue;
             }
             
-            echo "{$prefix}{$mn} = {$prefix}{$mn} || {};\n";
-            echo "{$prefix}{$mn}.template = {$prefix}{$mn}.template   || {};\n\n";
+            echo "{$prefix}{$mod} = {$prefix}{$mod} || {};\n";
+            echo "{$prefix}{$mod}.template = {$prefix}{$mod}.template   || {};\n\n";
             
             foreach(glob("$dir/*.html") as $fn) {
-                $name = "{$prefix}{$mn}.template." . preg_replace('/\.html$/i', '', basename($fn));
+                $name = "{$prefix}{$mod}.template." . preg_replace('/\.html$/i', '', basename($fn));
                 echo $this->compile($fn, $name) . "\n";
                 
 
@@ -110,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..?