extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 08:34:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix nextmatch in tabs did not correctly find tab, breaking loading & sizing

Browse Source
This commit is contained in:
nathan 2024-08-14 09:24:05 -06:00
parent 9b0dfbf973
commit 9fb4c0ab9a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/js/etemplate/et2_core_DOMWidget.ts
View File

@ -349,7 +349,7 @@ export abstract class et2_DOMWidget extends et2_widget implements et2_IDOMNode
{
// Find the tab by DOM heritage
// @ts-ignore
if(tabbox.tabData[i].contentDiv?.contains(this.div[0] || this))
if(tabbox.tabData[i].contentDiv?.contains(this.getDOMNode() || this))
{
return tabbox.tabData[i];
}
@ -363,7 +363,9 @@ export abstract class et2_DOMWidget extends et2_widget implements et2_IDOMNode
} while (template !== tabbox && template.getType() !== 'template');
for (var i = tabbox.tabData.length - 1; i >= 0; i--)
{
if (template && template.id && template.id === tabbox.tabData[i].id)
if(template && template.id &&
(template.id === tabbox.tabData[i].id || tabbox.tabData[i].contentDiv?.getWidgetById(template.id) !== null)
)
{
return tabbox.tabData[i];
}