Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rendering of circle element added to a group #2884

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions modules/src/xibo-player.js
Original file line number Diff line number Diff line change
Expand Up @@ -1445,9 +1445,18 @@ XiboPlayer.prototype.renderGlobalElements = function(currentWidget) {
$elementContentContainer,
);
}
});

// If there's a group content element
// Append it to the page
if ($groupContent) {
$content.append($groupContent);
}

// Invoke groupItem onTemplateRender if present
Promise.all(Array.from(elemObj.items).map(function(groupItem) {
const itemID =
groupItem.uniqueID || groupItem.templateData?.uniqueID;
groupItem.uniqueID || groupItem.templateData?.uniqueID;

// Call onTemplateRender
// Handle the rendering of the template
Expand All @@ -1459,13 +1468,7 @@ XiboPlayer.prototype.renderGlobalElements = function(currentWidget) {
{groupItem, ...groupItem.templateData, data: {}},
meta,
);
});

// If there's a group content element
// Append it to the page
if ($groupContent) {
$content.append($groupContent);
}
}));
}
} else {
// Single elements
Expand Down