Skip to content
Open
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,14 @@
}
}

async function onDocumentReady() {
async function initialiseForms() {
const startTime = new Date().getTime();
let elements = document.querySelectorAll(FormContainerV2.selectors.self);

for (let i = 0; i < elements.length; i++) {
if(elements.dataset?.cmpVisited === "true") {
continue;
}
let loaderToAdd = document.querySelector("[data-cmp-adaptiveform-container-loader='"+ elements[i].id + "']");
if(loaderToAdd){
loaderToAdd.classList.add(FormContainerV2.loadingClass);
Expand Down Expand Up @@ -153,8 +156,12 @@
document.cookie="wcmmode=disabled; max-age=0; path=/";

if (document.readyState !== "loading") {
onDocumentReady();
initialiseForms();
} else {
document.addEventListener("DOMContentLoaded", onDocumentReady);
document.addEventListener("DOMContentLoaded", initialiseForms);
}

window.Forms = window.Forms || {};
window.Forms.CoreComponents = window.Forms.CoreComponents || {};
window.Forms.CoreComponents.initialiseForms = initialiseForms;
})();
10 changes: 9 additions & 1 deletion ui.frontend/src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ class Utils {

const pathAttr = '[data-cmp-path="' + formContainer.getPath() + '"]';
const formContainerElement = document.querySelector(pathAttr);
if(!formContainerElement) return;
observer.observe(formContainerElement, {
subtree: true,
childList: true,
Expand Down Expand Up @@ -320,7 +321,14 @@ class Utils {
*/
static async setupFormContainer(createFormContainer, formContainerSelector, formContainerClass) {
FunctionRuntime.registerFunctions(customFunctions);
let elements = document.querySelectorAll(formContainerSelector);
let elements = Array.from(document.querySelectorAll(formContainerSelector));
// Avoid already initialised form container ( in case of multiple container in site )
elements = elements
.filter(element => element.dataset["cmpVisited"] !== "true")
.map(element => {
element.dataset["cmpVisited"] = "true";
return element;
});
for (let i = 0; i < elements.length; i++) {
const dataset = Utils.readData(elements[i], formContainerClass);
const customFunctionUrl = dataset["customFunctionsModuleUrl"];
Expand Down