Improve icon sorting

2 files changed, 15 insertions, 8 deletions

diff --git a/extension/public/iconGrabber.js b/extension/public/iconGrabber.js
index c463451..a255d01 100644
--- a/extension/public/iconGrabber.js
+++ b/extension/public/iconGrabber.js
@@ -1,4 +1,4 @@
-export function getBrowser() {
+function getBrowser() {
     if (typeof browser === "undefined") {
         return chrome;
     } else {
@@ -11,12 +11,19 @@ const tagTypes = ["apple-touch-icon", "shortcut icon", "icon"]
 let x = Array.from(document.getElementsByTagName("link"))
     .filter(elem => tagTypes.includes(elem.rel))
     .sort((a, b) => {
-        let tagCompare = tagTypes.indexOf(a.rel) - tagTypes.indexOf(b.rel);
-        if (tagCompare !== 0) return tagCompare;
-        try { return Number(b.sizes[0].split('x')[0]) - Number(a.sizes[0].split('x')[0]); }
-        catch { return -1; }
-    })
-    .map(elem => elem.href);
+        function compareTags() {
+            return tagTypes.indexOf(a.rel) - tagTypes.indexOf(b.rel);
+        }
+        function compareSizes() {
+            try { return Number(b.sizes[0].split('x')[0]) - Number(a.sizes[0].split('x')[0]); }
+            catch { return -1; }
+        }
+
+        return compareSizes() || compareTags()
+    });
+
+console.log("found icons", x.map(elem => elem.outerHTML));
+x = x.map(elem => elem.href);
 
 getBrowser().runtime.sendMessage([window.location.href, x[0]]).catch(() => {
     console.log("failed to send message")
diff --git a/extension/src/index.css b/extension/src/index.css
index 64f3bf2..ba651fc 100644
--- a/extension/src/index.css
+++ b/extension/src/index.css
@@ -83,7 +83,7 @@ body > .folderBody {
   flex-direction: column;
   width: 125px;
   padding: 10px;
-  margin: 5px;
+  margin: 10px;
   user-select: none;
 }