holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow access to current namespace content with {$_cont[...]}, since {$cont[...]} goes to the root

Browse Source 
(this might not be the best, but I can't figure out a better way with the compiled expressions)
This commit is contained in:
Nathan Gray 2013-10-30 17:16:20 +00:00
parent 064baf926a
commit 34e5d01de4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etemplate/js/et2_core_arrayMgr.js
View File

@ -220,6 +220,7 @@ var et2_arrayMgr = Class.extend(
var row = this.perspectiveData.row; var row = this.perspectiveData.row;
var row_cont = this.data[row]; var row_cont = this.data[row];
var cont = this.getRoot().data; var cont = this.getRoot().data;
var _cont = this.data;
// Check whether the expression has already been compiled - if not, // Check whether the expression has already been compiled - if not,
// try to compile it first. If an error occurs, the identifier // try to compile it first. If an error occurs, the identifier
@ -233,12 +234,12 @@ var et2_arrayMgr = Class.extend(
{ {
// No row, compile for only top level content // No row, compile for only top level content
proto.compiledExpressions[_ident] = et2_compilePHPExpression( proto.compiledExpressions[_ident] = et2_compilePHPExpression(
_ident, ["cont"]); _ident, ["cont","_cont"]);
} }
else else
{ {
proto.compiledExpressions[_ident] = et2_compilePHPExpression( proto.compiledExpressions[_ident] = et2_compilePHPExpression(
_ident, ["row", "cont", "row_cont"]); _ident, ["row", "cont", "row_cont", "_cont"]);
} }
} }
catch(e) catch(e)
@ -258,11 +259,11 @@ var et2_arrayMgr = Class.extend(
if(this.perspectiveData.row == null) if(this.perspectiveData.row == null)
{ {
// No row, exec with only top level content // No row, exec with only top level content
_ident = proto.compiledExpressions[_ident](cont); _ident = proto.compiledExpressions[_ident](cont,_cont);
} }
else else
{ {
_ident = proto.compiledExpressions[_ident](row, cont, row_cont); _ident = proto.compiledExpressions[_ident](row, cont, row_cont,_cont);
} }
} }
catch(e) catch(e)