extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-18 12:30:02 +02:00
Code Issues 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

10
etemplate/js/et2_core_arrayMgr.js
View File

@@ -208,7 +208,7 @@ var et2_arrayMgr = Class.extend(
* Expands variables inside the given identifier to their values inside the * Expands variables inside the given identifier to their values inside the
* content array. * content array.
* *
* @parm {string} _ident Key used to reference into managed array * @param {string} _ident Key used to reference into managed array
* @return {*} * @return {*}
*/ */
expandName : function(_ident) { expandName : function(_ident) {
@@ -331,7 +331,9 @@ var et2_arrayMgr = Class.extend(
/** /**
* ? * ?
* *
* @param _row [integer?] Key for into the _root for the desired row * @param {object} _owner owner object
* @param {(string|null|object)} _root string with key, null for whole data or object with data
* @param {number?} _row key for into the _root for the desired row
*/ */
openPerspective: function(_owner, _root, _row) openPerspective: function(_owner, _root, _row)
{ {
@@ -387,7 +389,7 @@ var et2_readonlysArrayMgr = et2_arrayMgr.extend(
_id = this.expandName(_id); _id = this.expandName(_id);
} }
entry = this.getEntry(_id); entry = this.getEntry(_id);
} }
// Let the array entry override the read only attribute entry // Let the array entry override the read only attribute entry
@@ -424,7 +426,7 @@ var et2_readonlysArrayMgr = et2_arrayMgr.extend(
*/ */
expandName: function(ident) expandName: function(ident)
{ {
return this.perspectiveData.owner.getArrayMgr('content').expandName(ident) return this.perspectiveData.owner.getArrayMgr('content').expandName(ident);
} }
}); });

13
etemplate/js/et2_core_phpExpressionCompiler.js
View File

@@ -28,7 +28,7 @@
function _throwParserErr(_p, _err) function _throwParserErr(_p, _err)
{ {
throw("Syntax error while parsing '" + _p.expr + "' at " + throw("Syntax error while parsing '" + _p.expr + "' at " +
_p.pos + ", " + _err); _p.pos + ", " + _err);
} }
@@ -57,6 +57,13 @@
break; break;
case '$': 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) if (str)
{ {
_tree.push(str); str = ""; _tree.push(str); str = "";
@@ -196,6 +203,10 @@
/** /**
* Reads a string delimited by the char _delim or the regExp _delim from the * Reads a string delimited by the char _delim or the regExp _delim from the
* current parser context and returns it. * 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) function _php_readString(_p, _delim)
{ {