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

Revert "Api: Nextmatch - Do not generate DOM nodes for hidden columns"

Browse Source 
This reverts commit 0f3a1660ff.
This commit is contained in:
nathangray 2019-12-04 09:49:21 -07:00
parent 9885a6960d
commit 673327da1e
4 changed files with 12 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/js/etemplate/et2_dataview.js
View File

@ -493,14 +493,11 @@ var et2_dataview = (function(){ "use strict"; return Class.extend({
*/ */
_buildGrid: function() { _buildGrid: function() {
// Create the collection of column ids // Create the collection of column ids
var colIds = new Array(); var colIds = new Array(this.columns.length);
for (var i = 0; i < this.columns.length; i++) for (var i = 0; i < this.columns.length; i++)
{
if(this.columns[i].visible)
{ {
colIds[i] = this.columns[i].id; colIds[i] = this.columns[i].id;
} }
}
// Create the row provider // Create the row provider
if (this.rowProvider) if (this.rowProvider)

7
api/js/etemplate/et2_dataview_view_rowProvider.js
View File

@ -100,14 +100,13 @@ var et2_dataview_rowProvider = (function(){ "use strict"; return Class.extend(
var tr = jQuery(document.createElement("tr")); var tr = jQuery(document.createElement("tr"));
// Append a td for each column // Append a td for each column
for (var column of this._columnIds) for (var i = 0; i < this._columnIds.length; i++)
{ {
if(!column) continue;
var td = jQuery(document.createElement("td")) var td = jQuery(document.createElement("td"))
.addClass(this._outerId + "_td_" + column) .addClass(this._outerId + "_td_" + this._columnIds[i])
.appendTo(tr); .appendTo(tr);
var div = jQuery(document.createElement("div")) var div = jQuery(document.createElement("div"))
.addClass(this._outerId + "_div_" + column) .addClass(this._outerId + "_div_" + this._columnIds[i])
.addClass("innerContainer") .addClass("innerContainer")
.appendTo(td); .appendTo(td);
} }

8
api/js/etemplate/et2_extension_nextmatch.js
View File

@ -1203,18 +1203,14 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
}, },
_parseDataRow: function(_row, _rowData, _colData) { _parseDataRow: function(_row, _rowData, _colData) {
var columnWidgets = new Array(); var columnWidgets = new Array(this.columns.length);
_row.sort(function(a,b) { _row.sort(function(a,b) {
return a.colData.order - b.colData.order; return a.colData.order - b.colData.order;
}); });
for (var x = 0; x < this.columns.length; x++) for (var x = 0; x < columnWidgets.length; x++)
{ {
if (!this.columns[x].visible)
{
continue;
}
if (typeof _row[x] != "undefined" && _row[x].widget) if (typeof _row[x] != "undefined" && _row[x].widget)
{ {
columnWidgets[x] = _row[x].widget; columnWidgets[x] = _row[x].widget;

28
api/js/etemplate/et2_extension_nextmatch_rowProvider.js
View File

@ -236,7 +236,7 @@ var et2_nextmatch_rowProvider = (function(){ "use strict"; return ClassWithAttri
_getVariableAttributeSet: function(_widget) { _getVariableAttributeSet: function(_widget) {
var variableAttributes = []; var variableAttributes = [];
var process = function(_widget) { _widget.iterateOver(function(_widget) {
// Create the attribtues // Create the attribtues
var hasAttr = false; var hasAttr = false;
var widgetData = { var widgetData = {
@ -270,19 +270,7 @@ var et2_nextmatch_rowProvider = (function(){ "use strict"; return ClassWithAttri
variableAttributes.push(widgetData); variableAttributes.push(widgetData);
} }
}; }, this);
// Check each column
var columns = _widget.getChildren();
for(var i = 0; i < columns.length; i++)
{
// If column is hidden, don't process it
if(this._context && this._context.columns && this._context.columns[i] && !this._context.columns[i].visible)
{
continue;
}
columns[i].iterateOver(process, this);
}
return variableAttributes; return variableAttributes;
}, },
@ -582,8 +570,7 @@ var et2_nextmatch_rowWidget = (function(){ "use strict"; return et2_widget.exten
*/ */
createWidgets: function(_widgets) { createWidgets: function(_widgets) {
// Clone the given the widgets with this element as parent // Clone the given the widgets with this element as parent
this._widgets = new Array(); this._widgets = new Array(_widgets.length);
var row_id = 0;
for (var i = 0; i < _widgets.length; i++) for (var i = 0; i < _widgets.length; i++)
{ {
// Disabled columns might be missing widget - skip it // Disabled columns might be missing widget - skip it
@ -594,9 +581,8 @@ var et2_nextmatch_rowWidget = (function(){ "use strict"; return et2_widget.exten
// Set column alignment from widget // Set column alignment from widget
if(this._widgets[i].align) if(this._widgets[i].align)
{ {
this._row.childNodes[row_id].align = this._widgets[i].align; this._row.childNodes[i].align = this._widgets[i].align;
} }
row_id++;
} }
}, },
@ -607,16 +593,12 @@ var et2_nextmatch_rowWidget = (function(){ "use strict"; return et2_widget.exten
* @return {DOMElement} * @return {DOMElement}
*/ */
getDOMNode: function(_sender) { getDOMNode: function(_sender) {
var row_id = 0;
for (var i = 0; i < this._widgets.length; i++) for (var i = 0; i < this._widgets.length; i++)
{ {
// Disabled columns might be missing widget - skip it
if(!this._widgets[i]) continue;
if (this._widgets[i] == _sender) if (this._widgets[i] == _sender)
{ {
return this._row.childNodes[row_id].childNodes[0]; // Return the i-th td tag return this._row.childNodes[i].childNodes[0]; // Return the i-th td tag
} }
row_id++;
} }
return null; return null;