Fix errors of fetching favicons for search engines

brookhong · Dec 16, 2023 · ab8461e · ab8461e
1 parent 119c110
commit ab8461e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/background/start.js b/src/background/start.js
@@ -1197,7 +1197,14 @@ function start(browser) {
                 text: canvas.toDataURL()
             });
         };
-
+        img.onerror = (e) => {
+            // retry without crossOrigin
+            if (img.crossOrigin) {
+                delete img.src;
+                img.crossOrigin = null;
+                img.src = message.url;
+            }
+        };
     };
     self.nextFrame = function(message, sender, sendResponse) {
         var tid = sender.tab.id;

diff --git a/src/content_scripts/ui/omnibar.js b/src/content_scripts/ui/omnibar.js
@@ -1283,7 +1283,7 @@ function SearchEngine(omnibar, front) {
             url: message.url,
             suggestionURL: message.suggestionURL
         };
-        const searchEngineIconStorageKey = `surfingkeys.searchEngineIcon.${message.alias}`;
+        const searchEngineIconStorageKey = `surfingkeys.searchEngineIcon.${message.prompt}`;
         const searchEngineIcon = localStorage.getItem(searchEngineIconStorageKey);
         if (searchEngineIcon) {
             self.aliases[message.alias].prompt = `<img src="${searchEngineIcon}" alt=${message.prompt} style="width: 20px;" />`;
@@ -1300,8 +1300,10 @@ function SearchEngine(omnibar, front) {
             RUNTIME('requestImage', {
                 url: iconUrl.href,
             }, function(response) {
-                localStorage.setItem(searchEngineIconStorageKey, response.text);
-                self.aliases[message.alias].prompt = `<img src="${response.text}" alt=${message.prompt} style="width: 20px;" />`;
+                if (response) {
+                    localStorage.setItem(searchEngineIconStorageKey, response.text);
+                    self.aliases[message.alias].prompt = `<img src="${response.text}" alt=${message.prompt} style="width: 20px;" />`;
+                }
             });
         }
     };