Hoisted iconContent check to avoid duplicate code

microsoft · Aug 30, 2023 · cf1aa66 · cf1aa66
1 parent 05bf37d
commit cf1aa66
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/webapp/src/toolbox.tsx b/webapp/src/toolbox.tsx
@@ -767,13 +767,13 @@ export class TreeRow extends data.Component<TreeRowProps, {}> {
         // Icon
         let iconClass = `blocklyTreeIcon${subns ? 'more' : icon ? (nameid || icon).toLowerCase() : 'Default'}`.replace(/\s/g, '');
         let iconContent = subns ? pxt.toolbox.getNamespaceIcon('more') : icon || pxt.toolbox.getNamespaceIcon('default');
+        const isImageIcon = iconContent.length > 1;  // It's probably an image icon, and not an icon code
         let iconImageStyle: React.CSSProperties = {
-            "--image-icon-url": `url("${Util.pathJoin(pxt.webConfig.commitCdnUrl, encodeURI(icon))}")!important`,
+            "--image-icon-url": isImageIcon ? `url("${Util.pathJoin(pxt.webConfig.commitCdnUrl, encodeURI(icon))}")!important`: undefined,
             display: "inline-block"
         } as React.CSSProperties;
 
-        if (iconContent.length > 1) {
-            // It's probably an image icon, and not an icon code
+        if (isImageIcon) {
             iconClass += ' image-icon';
             iconContent = undefined;
         }