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

Properly handle nextmatch columns where the width is not set

Browse Source
This commit is contained in:
Nathan Gray 2016-05-04 15:48:58 +00:00
parent 4c167a2d80
commit 0ecf39a722
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/js/etemplate/et2_dataview_model_columns.js
View File

@ -90,12 +90,19 @@ var et2_dataview_column = (function(){ "use strict"; return ClassWithAttributes.
this.initAttributes(_attrs);
},
/**
* Set the column width
*
* Posible value types are:
* 1. "100" => fixedWidth 100px
* 2. "100px" => fixedWidth 100px
* 3. "50%" => relativeWidth 50%
* 4. 0.5 => relativeWidth 50%
*
* @param {float|string} _value
*/
set_width: function(_value) {
// Parse the width parameter. Posible values are:
// 1. "100" => fixedWidth 100px
// 2. "100px" => fixedWidth 100px
// 3. "50%" => relativeWidth 50%
// 4. 0.5 => relativeWidth 50%
// Parse the width parameter.
this.relativeWidth = false;
this.fixedWidth = false;
var w = _value;
@ -408,7 +415,7 @@ var et2_dataview_columns = (function(){ "use strict"; return Class.extend({
if(this.columns[columnIndex].visibility === ET2_COL_VISIBILITY_INVISIBLE ||
this.columns[columnIndex].visibility === ET2_COL_VISIBILITY_DISABLED ||
this.columnWidths[columnIndex] <= 0 ||
this.columnWidths[columnIndex] <= this.columns[columnIndex].minWidth)
remaining_width > 0 && this.columnWidths[columnIndex] <= this.columns[columnIndex].minWidth)
{
continue;
}

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

@ -1061,6 +1061,12 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
"visibility": visibility,
"width": _colData[x] ? _colData[x].width : 0
};
if(_colData[x].width === 'auto')
{
// Column manager does not understand 'auto', which grid widget
// uses if width is not set
columnData[x].width = '100%';
}
if(_colData[x].minWidth)
{
columnData[x].minWidth = _colData[x].minWidth;