extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

create wrapper only for overflow != "visible", not needed otherwise and can break existing code, eg. name popup in addressbook.edit

Browse Source
This commit is contained in:
Ralf Becker 2014-02-19 17:18:54 +00:00
parent 530ebec63f
commit a7ee896adb
1 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
etemplate/js/et2_widget_grid.js
View File

@ -771,15 +771,16 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned],
* *
* Grid needs special handling because HTML tables don't do overflow. We * Grid needs special handling because HTML tables don't do overflow. We
* create a wrapper DIV to handle it. * create a wrapper DIV to handle it.
* No value or default visible needs no wrapper, as table is always overflow visible.
* *
* @param {string} _value Overflow value, must be a valid CSS overflow value. * @param {string} _value Overflow value, must be a valid CSS overflow value, default 'visible'
*/ */
set_overflow: function(_value) { set_overflow: function(_value) {
var wrapper = this.wrapper || this.table.parent('[id$="_grid_wrapper"]'); var wrapper = this.wrapper || this.table.parent('[id$="_grid_wrapper"]');
this.overflow = _value; this.overflow = _value;
if(wrapper.length == 0 && _value) if(wrapper.length == 0 && _value && _value !== 'visible')
{ {
this.wrapper = wrapper = this.table.wrap('<div id="'+this.id+'_grid_wrapper"></div>').parent(); this.wrapper = wrapper = this.table.wrap('<div id="'+this.id+'_grid_wrapper"></div>').parent();
if(this.height) if(this.height)
@ -789,38 +790,12 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned],
} }
wrapper.css('overflow', _value); wrapper.css('overflow', _value);
if(wrapper.length && (!_value || _value == null)) if(wrapper.length && (!_value || _value == null || _value === 'visible'))
{ {
this.table.unwrap(); this.table.unwrap();
} }
}, },
/**
* Set the height attribute
*
* Grid needs special handling because HTML tables don't care about height. We
* create a wrapper DIV to handle it.
*
* @param {string} _value Height value, must be a valid CSS height value.
*/
set_height: function(_value) {
this.height = _value;
// Height without overflow does nothing.
// This also makes sure that the wrapper is there.
if(!this.overflow)
{
this.set_overflow('hidden');
}
var wrapper = this.wrapper || this.table.parent('[id$="_grid_wrapper"]');
if(wrapper.length > 0 && _value)
{
wrapper.css('height', this.height);
}
},
set_align: function(_value) { set_align: function(_value) {
this.align = _value; this.align = _value;
}, },