🐛 Fix asset browser death when two fonts are in a folder

ct-js · Jan 3, 2024 · 4282a13 · 4282a13
1 parent d06d694
commit 4282a13
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/riotTags/shared/asset-browser.tag b/src/riotTags/shared/asset-browser.tag
@@ -358,7 +358,7 @@ asset-browser.flexfix(class="{opts.namespace} {opts.class} {compact: opts.compac
                 } else {
                     this.entries.sort((a, b) =>
                         this.sortFolderwise(a, b) ||
-                        a.name.localeCompare(b.name) ||
+                        (a.name ?? a.typefaceName).localeCompare(b.name ?? b.typefaceName) ||
                         this.sortTypewise(a, b));
                 }
             } else if (this.sort === 'type') {
@@ -372,7 +372,7 @@ asset-browser.flexfix(class="{opts.namespace} {opts.class} {compact: opts.compac
                     this.entries.sort((a, b) =>
                         this.sortFolderwise(a, b) ||
                         this.sortTypewise(a, b) ||
-                        a.name.localeCompare(b.name));
+                        (a.name ?? a.typefaceName).localeCompare(b.name ?? b.typefaceName));
                 }
             } else {
                 this.entries.sort((a, b) =>

diff --git a/src/riotTags/shared/asset-folder-tree.tag b/src/riotTags/shared/asset-folder-tree.tag
@@ -4,7 +4,7 @@
     Asset dropping logic is left in asset-browser for DRY purposes,
     but folder dropping is implemented here.
 
-    TODO: support folder dropping from asset-browser. 
+    TODO: support folder dropping from asset-browser.
 
     @attribute path (IAssetFolder[])
         Currently opened folders, from the root to the current directory.