projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #8131 - chinese translations
[Pman.Core]
/
JsTemplate.php
diff --git
a/JsTemplate.php
b/JsTemplate.php
index
8ad31a3
..
302b1c6
100644
(file)
--- a/
JsTemplate.php
+++ b/
JsTemplate.php
@@
-40,10
+40,12
@@
class Pman_Core_JsTemplate extends Pman {
}
}
- function get()
+ function get(
$v, $opts=array()
)
{
{
+
+ $this->sessionState(0);
// get the modules.
// get the modules.
-
//
header('Content-type: text/javascript');
+ header('Content-type: text/javascript');
$ff = HTML_FlexyFramework::get();
$ff = HTML_FlexyFramework::get();
@@
-58,12
+60,12
@@
class Pman_Core_JsTemplate extends Pman {
foreach($mods as $mod )
{
$prefix = $mod == $pr ? "" : "{$pr}.";
foreach($mods as $mod )
{
$prefix = $mod == $pr ? "" : "{$pr}.";
- var_dump($prefix);
+
//
var_dump($prefix);
$pdir = $mod == $pr ? '' : ($pr .'/') ;
$dir = $this->rootDir .'/'.$pdir . $mod . '/jtemplates';
if (!file_exists($dir)) {
$pdir = $mod == $pr ? '' : ($pr .'/') ;
$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..
continue;
}
// got a directory..
@@
-111,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..?
@@
-125,46
+127,46
@@
class Pman_Core_JsTemplate extends Pman {
//var_Dump(substr($item,-3,2));
switch(true) {
case (!strlen($item)):
//var_Dump(substr($item,-3,2));
switch(true) {
case (!strlen($item)):
- continue;
+ continue
2
;
case ($inscript && ($item != '{end:}')):
$ret[count($ret)-1] .= $item;
case ($inscript && ($item != '{end:}')):
$ret[count($ret)-1] .= $item;
- continue;
+ continue
2
;
case ($inscript && ($item == '{end:}')):
$inscript = false;
case ($inscript && ($item == '{end:}')):
$inscript = false;
- continue;
+ continue
2
;
case ($item[0] != '{'):
if (!strlen(trim($item))) {
case ($item[0] != '{'):
if (!strlen(trim($item))) {
- continue;
+ continue
2
;
}
$ret[] = $in . "ret += ". json_encode($item) . ";";
}
$ret[] = $in . "ret += ". json_encode($item) . ";";
- continue;
+ continue
2
;
case ($item == '{script:}'):
$inscript = true;
$ret[] = '';
case ($item == '{script:}'):
$inscript = true;
$ret[] = '';
- continue;
+ continue
2
;
case ($item[1] == '!'):
$ret[] = $in . substr($item,2,-1) .';';
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++;
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++;
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--;
case (substr($item,1,4) == 'end:'):
$indent--;
@@
-174,11
+176,11
@@
class Pman_Core_JsTemplate extends Pman {
$fstart = -1;
$ret = &$out;
}
$fstart = -1;
$ret = &$out;
}
- continue;
+ continue
2
;
case (substr($item,1,7) == 'return:'):
$ret[] = $in . "return;";
case (substr($item,1,7) == 'return:'):
$ret[] = $in . "return;";
- continue;
+ continue
2
;
case (substr($item,1,9) == 'function:'):
$fstart = $indent;
case (substr($item,1,9) == 'function:'):
$fstart = $indent;
@@
-189,19
+191,19
@@
class Pman_Core_JsTemplate extends Pman {
$ret[] = $in . "var $name = function (" . $body . '{';
$ret[] = $in . "var $name = function (" . $body . '{';
- continue;
+ continue
2
;
default:
if (substr($item,-3,2) == ':h') {
$ret[] = $in . "ret += ". substr($item,1,-3) . ';';
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");';
}
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).');';
}
$ret[] = $in . "ret += Roo.util.Format.htmlEncode(". substr($item,1,-1).');';
- continue;
+ continue
2
;
}
}