Wrap browserAction.setIcon and .setAction for Firefoxmanifest_v3

1 files changed, 21 insertions, 3 deletions

diff --git a/keepassxc-browser/background/browserAction.js b/keepassxc-browser/background/browserAction.js
index f757d74..d85d8d5 100755
--- a/keepassxc-browser/background/browserAction.js
+++ b/keepassxc-browser/background/browserAction.js
@@ -9,12 +9,12 @@ browserAction.show = function(tab, popupData) {
 
     page.popupData = popupData;
 
-    browser.action.setIcon({
+    browserAction.setIcon({
         path: browserAction.generateIconName(popupData.iconType)
     });
 
     if (popupData.popup) {
-        browser.action.setPopup({
+        browserAction.setPopup({
             tabId: tab.id,
             popup: `popups/${popupData.popup}.html`
         });
@@ -55,7 +55,7 @@ browserAction.updateIcon = async function(tab, iconType) {
         tab = tabs[0];
     }
 
-    browser.action.setIcon({
+    browserAction.setIcon({
         path: browserAction.generateIconName(iconType)
     });
 };
@@ -82,3 +82,21 @@ browserAction.ignoreSite = async function(url) {
         args: [ url ]
     });
 };
+
+// Wrapper for V2 (Firefox)
+browserAction.setIcon = function(icon) {
+    if (isFirefox()) {
+        browser.browserAction.setIcon(icon);
+    } else {
+        browser.action.setIcon(icon);
+    }
+};
+
+// Wrapper for V2 (Firefox)
+browserAction.setPopup = function(popup) {
+    if (isFirefox()) {
+        browser.browserAction.setPopup(popup);
+    } else {
+        browser.action.setPopup(popup);
+    }
+};