projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #5992 - gnumeric download progress
[Pman.Core]
/
JsTemplate.php
diff --git
a/JsTemplate.php
b/JsTemplate.php
index
75f0737
..
f138791
100644
(file)
--- a/
JsTemplate.php
+++ b/
JsTemplate.php
@@
-40,37
+40,47
@@
class Pman_Core_JsTemplate extends Pman {
}
}
- function get()
+ function get(
$v, $opts=array()
)
{
{
+
+ $this->sessionState(0);
// get the modules.
header('Content-type: text/javascript');
$ff = HTML_FlexyFramework::get();
$pr = $ff->project;
// get the modules.
header('Content-type: text/javascript');
$ff = HTML_FlexyFramework::get();
$pr = $ff->project;
- $ar = explode(PATH_SEPARATOR, $ff->HTML_Template_Flexy['templateDir']);
- $prefix = $pr == 'Pman' ? 'Pman.' : '';
+ $mods = $this->modulesList();
+ //print_r($mods);
+
+ //$ar = explode(PATH_SEPARATOR, $ff->HTML_Template_Flexy['templateDir']);
+ array_push($mods, $pr);
- foreach($ar as $mod) {
- $dir = dirname($mod) . '/jtemplates';
+ foreach($mods as $mod )
+ {
+ $prefix = $mod == $pr ? "" : "{$pr}.";
+ //var_dump($prefix);
+ $pdir = $mod == $pr ? '' : ($pr .'/') ;
+
+ $dir = $this->rootDir .'/'.$pdir . $mod . '/jtemplates';
if (!file_exists($dir)) {
echo '// missing directory '. htmlspecialchars($dir) ."\n";
continue;
}
// got a directory..
if (!file_exists($dir)) {
echo '// missing directory '. htmlspecialchars($dir) ."\n";
continue;
}
// got a directory..
- $mn = basename(dirname($mod));
+
$ar = glob("$dir/*.html") ;
if (empty($ar)) {
echo '// no template is directory '. htmlspecialchars($dir) ."\n";
continue;
}
$ar = glob("$dir/*.html") ;
if (empty($ar)) {
echo '// no template is directory '. htmlspecialchars($dir) ."\n";
continue;
}
- echo "{$prefix}{$m
n} = {$prefix}{$mn
} || {};\n";
- echo "{$prefix}{$m
n}.template = {$prefix}{$mn
}.template || {};\n\n";
+ echo "{$prefix}{$m
od} = {$prefix}{$mod
} || {};\n";
+ echo "{$prefix}{$m
od}.template = {$prefix}{$mod
}.template || {};\n\n";
foreach(glob("$dir/*.html") as $fn) {
foreach(glob("$dir/*.html") as $fn) {
- $name = "{$prefix}{$m
n
}.template." . preg_replace('/\.html$/i', '', basename($fn));
+ $name = "{$prefix}{$m
od
}.template." . preg_replace('/\.html$/i', '', basename($fn));
echo $this->compile($fn, $name) . "\n";
echo $this->compile($fn, $name) . "\n";
@@
-103,7
+113,7
@@
class Pman_Core_JsTemplate extends Pman {
$out= array();
$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..?
$funcs = array();
// do not allow nested functions..?
@@
-120,7
+130,7
@@
class Pman_Core_JsTemplate extends Pman {
continue;
case ($inscript && ($item != '{end:}')):
continue;
case ($inscript && ($item != '{end:}')):
- $ret[
]
= $item;
+ $ret[
count($ret)-1] .
= $item;
continue;
case ($inscript && ($item == '{end:}')):
continue;
case ($inscript && ($item == '{end:}')):
@@
-138,6
+148,7
@@
class Pman_Core_JsTemplate extends Pman {
case ($item == '{script:}'):
$inscript = true;
case ($item == '{script:}'):
$inscript = true;
+ $ret[] = '';
continue;
case ($item[1] == '!'):
continue;
case ($item[1] == '!'):
@@
-150,6
+161,13
@@
class Pman_Core_JsTemplate extends Pman {
$indent++;
continue;
$indent++;
continue;
+ case (substr($item,1,5) == 'else:'):
+ $indent--;
+ $in = str_repeat(" ", $indent);
+ $ret[] = $in . "} else { ";
+ $indent++;
+ continue;
+
case (substr($item,1,4) == 'end:'):
$indent--;
$in = str_repeat(" ", $indent);
case (substr($item,1,4) == 'end:'):
$indent--;
$in = str_repeat(" ", $indent);
@@
-192,7
+210,7
@@
class Pman_Core_JsTemplate extends Pman {
}
$in = str_repeat(" ", $indent);
}
$in = str_repeat(" ", $indent);
- $ret[] = $in . "return ret
)
;\n}\n";
+ $ret[] = $in . "return ret;\n}\n";
return $head . implode("\n",$funcs) . "\n\n" .implode("\n",$out) ;
//echo '<PRE>' . htmlspecialchars(implode("\n",$ret));
return $head . implode("\n",$funcs) . "\n\n" .implode("\n",$out) ;
//echo '<PRE>' . htmlspecialchars(implode("\n",$ret));