extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Get nextmatch to render a little more nicely on a tab when it's not on the first tab

Browse Source
This commit is contained in:
nathangray 2019-04-01 16:08:39 -06:00
parent 1b8ce9ac33
commit b7605e2b3b
1 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,24 +200,9 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
this.innerDiv = jQuery(document.createElement("div"))
.appendTo(this.div);
// Find the parent container, either a tab or the main container
var parent = this;
do {
parent = parent._parent;
} while (parent != this.getRoot() && parent._type != 'tabbox');
if(parent === this.getRoot())
{
parent = this.getInstanceManager().DOMContainer;
}
else
{
// Tab defers loading its tabs until later, but we need a parent now
parent = this._parent.getDOMNode() || this.getInstanceManager().DOMContainer;
}
// Create the dynheight component which dynamically scales the inner
// container.
this.dynheight = new et2_dynheight(parent, this.innerDiv, 100);
this.dynheight = this._getDynheight(this);
// Create the outer grid container
this.dataview = new et2_dataview(this.innerDiv, this.egw());
@ -294,6 +279,12 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
doLoadingFinished: function() {
this._super.apply(this, arguments);
if(!this.dynheight)
{
debugger;
this.dynheight = this._getDynheight(this);
}
// Register handler for dropped files, if possible
if(this.options.settings.row_id)
{
@ -719,6 +710,43 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
}
},
/**
* Create the dynamic height so nm fills all available space
*
* @returns {undefined}
*/
_getDynheight: function() {
// Find the parent container, either a tab or the main container
var parent = this;
do {
parent = parent._parent;
} while (parent != this.getRoot() && parent._type != 'tabbox');
// No tabs, take the whole thing
if(parent === this.getRoot())
{
parent = this.getInstanceManager().DOMContainer;
return new et2_dynheight(parent, this.innerDiv, 100);
}
// Find the tab index
for(var i = 0; i < parent.tabData.length; i++)
{
// Find the tab
if(parent.tabData[i].contentDiv.has(this.div).length)
{
return new et2_dynheight(parent.tabData[i].contentDiv, this.innerDiv, 100);
}
}
// Deferred loading of tabs
if(parent.isInTree())
{
return new et2_dynheight(parent.tabContainer, this.innerDiv, 100);
}
return false;
},
/**
* Generates the column caption for the given column widget
*
@ -1773,6 +1801,10 @@ var et2_nextmatch = (function(){ "use strict"; return et2_DOMWidget.extend([et2_
jQuery.when.apply(null, promise).done(
jQuery.proxy(function() {
parse.call(this, template);
if(!this.dynheight)
{
this.dynheight = this._getDynheight(this);
}
this.dynheight.initialized = false;
this.resize();
}, this)