diff --git a/etemplate/js/et2_core_arrayMgr.js b/etemplate/js/et2_core_arrayMgr.js index 951cfdcff9..640806ba95 100644 --- a/etemplate/js/et2_core_arrayMgr.js +++ b/etemplate/js/et2_core_arrayMgr.js @@ -208,7 +208,7 @@ var et2_arrayMgr = Class.extend( * Expands variables inside the given identifier to their values inside the * content array. * - * @parm {string} _ident Key used to reference into managed array + * @param {string} _ident Key used to reference into managed array * @return {*} */ 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) { @@ -387,7 +389,7 @@ var et2_readonlysArrayMgr = et2_arrayMgr.extend( _id = this.expandName(_id); } entry = this.getEntry(_id); - + } // Let the array entry override the read only attribute entry @@ -424,7 +426,7 @@ var et2_readonlysArrayMgr = et2_arrayMgr.extend( */ expandName: function(ident) { - return this.perspectiveData.owner.getArrayMgr('content').expandName(ident) + return this.perspectiveData.owner.getArrayMgr('content').expandName(ident); } }); diff --git a/etemplate/js/et2_core_phpExpressionCompiler.js b/etemplate/js/et2_core_phpExpressionCompiler.js index fc16ed5269..10ba8adae5 100644 --- a/etemplate/js/et2_core_phpExpressionCompiler.js +++ b/etemplate/js/et2_core_phpExpressionCompiler.js @@ -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) {