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

fix Syntax error while parsing "You can use $$start$$ for the above start date and $$end$$ for the end date." at 13, expected variable identifier and fixed IDE warnings

Browse Source
This commit is contained in:
Ralf Becker
2014-02-12 19:32:34 +00:00
parent 75316761b2
commit 082f3242ee
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
etemplate/js/et2_core_phpExpressionCompiler.js
View File

@ -28,7 +28,7 @@
function _throwParserErr(_p, _err)
{
throw("Syntax error while parsing '" + _p.expr + "' at " +
throw("Syntax error while parsing '" + _p.expr + "' at " +
_p.pos + ", " + _err);
}
@ -57,6 +57,13 @@
break;
case '$':
// check for '$$' as used in placeholder syntax, it is NOT expanded and returned as is
if (_p.expr.charAt(_p.pos) == "$" && state == STATE_DEFAULT)
{
_p.pos++;
str += '$$';
break;
}
if (str)
{
_tree.push(str); str = "";
@ -196,6 +203,10 @@
/**
* Reads a string delimited by the char _delim or the regExp _delim from the
* current parser context and returns it.
*
* @param {object} _p parser contect
* @param {string} _delim delimiter
* @return {string} string read (or throws an exception)
*/
function _php_readString(_p, _delim)
{