extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change auto-repeat detection to additionally look through widgets for IDs like const[$row] when there is no row content

Browse Source
This commit is contained in:
Nathan Gray 2013-09-09 18:52:11 +00:00
parent bfef97c8fc
commit 230472d256
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
etemplate/js/et2_widget_grid.js
View File

@ -218,7 +218,8 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned],
var rowDataEntry = rowData[rowData.length-1]; var rowDataEntry = rowData[rowData.length-1];
var rowIndex = rowData.length-1; var rowIndex = rowData.length-1;
// Find out if we have any content rows, and how many // Find out if we have any content rows, and how many
while(true) var cont = true;
while(cont)
{ {
if(content.data[rowIndex]) if(content.data[rowIndex])
{ {
@ -226,6 +227,42 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned],
rowIndex++; rowIndex++;
} }
else if (this.lastRowNode != null)
{
// Have to look through actual widgets to support const[$row]
// style names - should be avoided so we can remove this extra check
// Old etemplate checked first two widgets, or first two box children
var currentPerspective = jQuery.extend({},content.perspectiveData);
var check = function(node, nodeName)
{
if(nodeName == 'box' || nodeName == 'hbox' || nodeName == 'vbox')
{
return et2_filteredNodeIterator(node, check, this);
}
content.perspectiveData.row = rowIndex;
for(var attr in node.attributes)
{
var value = et2_readAttrWithDefault(node, node.attributes[attr].name, "");
// Don't include first char, those should be handled by normal means
// and it would break nextmatch
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;
}
return;
}
}
};
et2_filteredNodeIterator(this.lastRowNode, check,this);
cont = false;
content.perspectiveData = currentPerspective;
}
else else
{ {
// No more rows, stop // No more rows, stop
@ -421,10 +458,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned],
var mgrs = this.getArrayMgrs(); var mgrs = this.getArrayMgrs();
for(var name in mgrs) for(var name in mgrs)
{ {
if(this.getArrayMgr(name).getEntry(y)) this.getArrayMgr(name).perspectiveData.row = y;
{
this.getArrayMgr(name).perspectiveData.row = y;
}
} }
if(this._getCell(cells, x, y).rowData.id) if(this._getCell(cells, x, y).rowData.id)
{ {