fix: register iconset when vaadin-iconset is defined

FlowingCode · Apr 30, 2024 · 99ad284 · 99ad284
1 parent a284d9a
commit 99ad284
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/codegen/modularize.xslt b/src/codegen/modularize.xslt
@@ -45,8 +45,9 @@ const template = document.createElement('template');
 template.innerHTML = `
 </xsl:text>
     <xsl:copy-of select="//fc-iconset/svg"/>
-<xsl:text>`;
+<xsl:text disable-output-escaping="yes">`;
 
+customElements.whenDefined('vaadin-iconset').then(Iconset=>{
 Iconset.register('</xsl:text
 ><xsl:value-of select="$family"/><xsl:text
 >', 1000, template);
@@ -58,7 +59,7 @@ const iconset = Iconset.getIconset('</xsl:text
 for (const name in aliases) {
     iconset._icons[name] = iconset._icons[aliases[name]];
 }
-
+});
 </xsl:text>
 </xsl:template>
 

diff --git a/src/main/javascript/font-awesome-iron-iconset/fab.js b/src/main/javascript/font-awesome-iron-iconset/fab.js
diff --git a/src/main/javascript/font-awesome-iron-iconset/far.js b/src/main/javascript/font-awesome-iron-iconset/far.js
diff --git a/src/main/javascript/font-awesome-iron-iconset/fas.js b/src/main/javascript/font-awesome-iron-iconset/fas.js
@@ -8950,11 +8950,12 @@ template.innerHTML = `
    </defs>
 </svg>`;
 
+customElements.whenDefined('vaadin-iconset').then(Iconset=>{
 Iconset.register('fas', 1000, template);
 
 const iconset = Iconset.getIconset('fas');
 
 for (const name in aliases) {
     iconset._icons[name] = iconset._icons[aliases[name]];
 }
-
+});