JsTemplate.php

[Pman.Core] / JsTemplate.php

diff --git a/JsTemplate.php b/JsTemplate.php
index 2639bb2..6921d32 100644 (file)
--- a/JsTemplate.php
+++ b/JsTemplate.php
@@ -45,12 +45,12 @@ class Pman_Core_JsTemplate extends Pman {
         // get the modules.
         header('Content-type: text/javascript');
         
-        $ff = HTML_FlexyFramework::get()->HTML_Template_Flexy;
-        
-        $ar = explode(PATH_SEPARATOR, $ff['templateDir']);
-        
+        $ff = HTML_FlexyFramework::get();
         
+        $pr = $ff->project;
+        $ar = explode(PATH_SEPARATOR, $ff->HTML_Template_Flexy['templateDir']);
         
+        $prefix = $pr == 'Pman' ? 'Pman.' : '';
         
         foreach($ar as $mod) {
             $dir =   dirname($mod) . '/jtemplates';
@@ -65,12 +65,13 @@ class Pman_Core_JsTemplate extends Pman {
                 echo '// no template is directory '. htmlspecialchars($dir) ."\n";
                 continue;
             }
-            echo "Pman.{$mn} = Pman.{$mn} || {};\n";
-            echo "Pman.{$mn}.template = Pman.{$mn}.template   || {};\n\n";
+            
+            echo "{$prefix}{$mn} = {$prefix}{$mn} || {};\n";
+            echo "{$prefix}{$mn}.template = {$prefix}{$mn}.template   || {};\n\n";
             
             foreach(glob("$dir/*.html") as $fn) {
-                $name = 'Pman.' . $mn .'.template.' . preg_replace('/\.html$/i', '', basename($fn));
-                echo $this->compile($fn, $name) . "\m";
+                $name = "{$prefix}{$mn}.template." . preg_replace('/\.html$/i', '', basename($fn));
+                echo $this->compile($fn, $name) . "\n";
                 
 
             }
@@ -112,7 +113,7 @@ class Pman_Core_JsTemplate extends Pman {
                     if (!strlen(trim($item))) {
                         continue;
                     }
-                    $ret[] = $in . "ret+= ". json_encode($item) . ";";
+                    $ret[] = $in . "ret += ". json_encode($item) . ";";
                     continue;
                 
                 case (substr($item,1,3) == 'if('):