holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix child order when children are a mix of WebComponent & legacy widgets

Browse Source
This commit is contained in:
nathan 2021-09-13 11:26:29 -06:00
parent 6abb239705
commit b7e34ed779
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/js/etemplate/Et2Widget/Et2Widget.ts
View File

@ -519,14 +519,16 @@ const Et2WidgetMixin = (superClass) =>
this.getParent().getDOMNode(this).append(this); this.getParent().getDOMNode(this).append(this);
} }
// An empty text node causes problems with legacy widget children
// It throws off their insertion indexing, making them get added in the wrong place
if(this.childNodes[0]?.nodeType == this.TEXT_NODE)
{
this.removeChild(this.childNodes[0]);
}
for(let i = 0; i < this.getChildren().length; i++) for(let i = 0; i < this.getChildren().length; i++)
{ {
let child = this.getChildren()[i]; let child = this.getChildren()[i];
let child_node = typeof child.getDOMNode !== "undefined" ? child.getDOMNode(child) : null;
if(child_node && child_node !== this)
{
this.append(child_node);
}
child.loadingFinished(promises); child.loadingFinished(promises);
} }
} }