From 5df1298bfda43bb62e384db946ffd07fc867179e Mon Sep 17 00:00:00 2001
From: mauro-balades <mauro.balades@tutanota.com>
Date: Sat, 28 Sep 2024 22:10:35 +0200
Subject: [PATCH] Refactor keyboard shortcuts to use "Cmd" instead of "Meta"
 for macOS

---
 src/ZenKeyboardShortcuts.mjs |  4 ++--
 src/ZenSidebarManager.mjs    | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/ZenKeyboardShortcuts.mjs b/src/ZenKeyboardShortcuts.mjs
index 44245e6..1880d81 100644
--- a/src/ZenKeyboardShortcuts.mjs
+++ b/src/ZenKeyboardShortcuts.mjs
@@ -175,11 +175,11 @@ class KeyShortcutModifiers {
       str += 'Shift+';
     }
     if (this.#meta) {
-      str += AppConstants.platform == 'macosx' ? 'Meta+' : 'Win+';
+      str += AppConstants.platform == 'macosx' ? 'Cmd+' : 'Win+';
     }
     if (this.#accel) {
       if (AppConstants.platform == 'macosx') {
-        str += 'Cmd+';
+        str += 'Meta+';
       } else {
         str += 'Ctrl+';
       }
diff --git a/src/ZenSidebarManager.mjs b/src/ZenSidebarManager.mjs
index 8aee0e6..a6ddfc6 100644
--- a/src/ZenSidebarManager.mjs
+++ b/src/ZenSidebarManager.mjs
@@ -461,16 +461,16 @@ var gZenBrowserManagerSidebar = {
   _getWebPanelIcon(url, element) {
     let { preferredURI } = Services.uriFixup.getFixupURIInfo(url);
     element.setAttribute('image', `page-icon:${preferredURI.spec}`);
-    //fetch(`https://s2.googleusercontent.com/s2/favicons?domain_url=${preferredURI.spec}`).then(async (response) => {
-    //  if (response.ok) {
-    //    let blob = await response.blob();
-    //    let reader = new FileReader();
-    //    reader.onload = function () {
-    //      element.setAttribute('image', reader.result);
-    //    };
-    //    reader.readAsDataURL(blob);
-    //  }
-    //});
+    fetch(`https://s2.googleusercontent.com/s2/favicons?domain_url=${preferredURI.spec}`).then(async (response) => {
+      if (response.ok) {
+        let blob = await response.blob();
+        let reader = new FileReader();
+        reader.onload = function () {
+          element.setAttribute('image', reader.result);
+        };
+        reader.readAsDataURL(blob);
+      }
+    });
   },
 
   _getBrowserById(id) {