await in load icon and return cIcon

iTowns · Oct 20, 2023 · 3cec734 · 3cec734
1 parent 95c0244
commit 3cec734
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/src/Core/Label.js b/src/Core/Label.js
@@ -101,10 +101,8 @@ class Label extends THREE.Object3D {
                 }
                 style.applyToHTML(this.content)
                     .then((icon) => {
-                        if (icon) {
-                            icon.addEventListener('loaded', ()  => {
-                                this.icon = this.content.getElementsByClassName('itowns-icon')[0];
-                            }, { once: true });
+                        if (icon) { // Not sure if that test is needed...
+                            this.icon = icon;
                         }
                     });
             }

diff --git a/src/Core/Style.js b/src/Core/Style.js
@@ -945,17 +945,25 @@ class Style {
             }
 
             cIcon.style['z-index'] = -1;
-            domElement.appendChild(cIcon);
-            const event = new Event('loaded');
-            icon.dispatchEvent(event);
+            return cIcon;
         };
 
+        const loadIcon = icon => new Promise((resolve, reject) => {
+            icon.onload = () => {
+                const cIcon = addIcon();
+                resolve(cIcon);
+            };
+            icon.onerror = reject;
+        });
+
+        let cIcon;
         if (icon.complete) {
-            addIcon();
+            cIcon = addIcon();
         } else {
-            icon.addEventListener('load', addIcon, { once: true });
+            cIcon = await loadIcon(icon);
         }
-        return icon;
+        domElement.appendChild(cIcon);
+        return cIcon;
     }
 
     /**