extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-02 20:19:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Etemplate: More robust checking in get_tab_info() to handle tab template not fully loaded yet

Browse Source
This commit is contained in:
nathangray 2019-09-23 16:33:20 -06:00
parent e83ad2cf5a
commit d602ec6677
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/js/etemplate/et2_core_DOMWidget.js
View File

@ -274,13 +274,26 @@ var et2_DOMWidget = (function(){ "use strict"; return et2_widget.extend(et2_IDOM
// Find the tab index // Find the tab index
for(var i = 0; i < parent.tabData.length; i++) for(var i = 0; i < parent.tabData.length; i++)
{ {
// Find the tab // Find the tab by DOM heritage
if(parent.tabData[i].contentDiv.has(this.div).length) if(parent.tabData[i].contentDiv.has(this.div).length)
{ {
return parent.tabData[i]; return parent.tabData[i];
} }
} }
// On a tab, but we couldn't find it? This gives best result so far. // On a tab, but we couldn't find it by DOM nodes Maybe tab template is
// not loaded yet. Try checking IDs.
var template = this;
do {
template = template._parent;
} while (template !== parent && template._type !== 'template');
for(var i = parent.tabData.length - 1; i >= 0; i--)
{
if(template && template.id && template.id === parent.tabData[i].id)
{
return parent.tabData[i];
}
}
// Fallback
return this._parent.get_tab_info(); return this._parent.get_tab_info();
}, },