extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-09 16:35:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed correct expanding of names and implemented the dataProvider class

Browse Source
This commit is contained in:
Andreas Stöckel
2011-09-08 18:36:09 +00:00
parent e151398d94
commit 87c0db7be1
19 changed files with 526 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
etemplate/js/et2_core_phpExpressionCompiler.js
View File

@ -343,12 +343,14 @@
}
var parts = [];
var hasString = false;
for (var i = 0; i < _string.length; i++)
{
var part = _string[i];
if (typeof part == "string")
{
hasString = true;
// Escape all "'" and "\" chars and add the string to the parts array
parts.push("'" + part.replace(/\\/g, "\\\\").replace(/'/g, "\\'") + "'");
}
@ -358,7 +360,7 @@
}
}
if (parts.length == 0)
if (!hasString) // Force the result to be of the type string
{
parts.push('""');
}
@ -433,6 +435,7 @@
test("${row}[title]", "10[title]");
test("{$row_cont[title]}", "Hello World!");
test('{$cont["$row"][\'title\']}', "Hello World!");
test("$row_cont[${row}[title]]");
test("\\\\", "\\");
test("", "");
})();*/