Merge pull request #7027 from telamonian/fix-ft-iconclass-missing

restores silent failure behavior when a fileType has no iconClass
jupyterlab · Aug 16, 2019 · 8190b83 · 8190b83
2 parents bef72f1 + 5b61a77
commit 8190b83
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/packages/ui-components/src/icon/iconregistry.tsx b/packages/ui-components/src/icon/iconregistry.tsx
@@ -125,12 +125,16 @@ export class IconRegistry implements IIconRegistry {
 
   resolveName(name: string): string {
     if (!(name in this._svg)) {
-      // assume name is really a className, split the className into parts and check each part
-      for (let className of name.split(/\s+/)) {
-        if (className in this._classNameToName) {
-          return this._classNameToName[className];
+      // skip resolution if name is not defined
+      if (name) {
+        // assume name is really a className, split the className into parts and check each part
+        for (let className of name.split(/\s+/)) {
+          if (className in this._classNameToName) {
+            return this._classNameToName[className];
+          }
         }
       }
+
       if (this._debug) {
         // couldn't resolve name, mark as bad and warn
         console.error(`Invalid icon name: ${name}`);