mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-28 01:29:05 +01:00
Check to see if the substitution actually got something, or we could wreck the nextmatch rows.
This commit is contained in:
parent
230472d256
commit
2087aed7a3
@ -249,11 +249,17 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned],
|
||||
if(value.indexOf('@') > 0 || value.indexOf('$') > 0)
|
||||
{
|
||||
// Ok, we found something. How many?
|
||||
while(typeof content.expandName(value) !== 'undefined')
|
||||
{
|
||||
rowData[rowIndex] = jQuery.extend({}, rowDataEntry);
|
||||
content.perspectiveData.row = ++rowIndex;
|
||||
}
|
||||
do {
|
||||
var ident = content.expandName(value);
|
||||
var regex = new RegExp("\\[" + content.perspectiveData.row + "\\]");
|
||||
|
||||
if(ident.match(regex))
|
||||
{
|
||||
rowData[rowIndex] = jQuery.extend({}, rowDataEntry);
|
||||
content.perspectiveData.row = ++rowIndex;
|
||||
regex = new RegExp("\\[" + content.perspectiveData.row + "\\]");
|
||||
}
|
||||
} while(ident.match(regex))
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user