From 2d500f8074e30a80d58e7385412225ba0c73d863 Mon Sep 17 00:00:00 2001 From: Connor Christie Date: Sun, 14 Jan 2018 22:03:09 -0600 Subject: [PATCH] Fix to emit DOM_OBJECTS_CREATED event after module DOMs have actually loaded --- js/main.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/js/main.js b/js/main.js index 0e1e5239..4bd45a7f 100644 --- a/js/main.js +++ b/js/main.js @@ -19,6 +19,8 @@ var MM = (function() { * are configured for a specific position. */ var createDomObjects = function() { + var domCreationPromises = []; + modules.forEach(module => { if (typeof module.data.position !== "string") { return; @@ -48,14 +50,18 @@ var MM = (function() { moduleContent.className = "module-content"; dom.appendChild(moduleContent); - updateDom(module, 0).then(() => { + var domCreationPromise = updateDom(module, 0); + domCreationPromises.push(domCreationPromise); + domCreationPromise.then(() => { sendNotification("MODULE_DOM_CREATED", null, null, module); }).catch(Log.error); }); updateWrapperStates(); - sendNotification("DOM_OBJECTS_CREATED"); + Promise.all(domCreationPromises).then(() => { + sendNotification("DOM_OBJECTS_CREATED"); + }); }; /* selectWrapper(position)