Added chrome support #18

4 files changed, 5 insertions, 27 deletions

diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 940a2ed7..6055f3fe 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -35,7 +35,7 @@ wholeInit();
 browser.storage.onChanged.addListener(wholeInit);
 
 browser.webRequest.onBeforeRequest.addListener(
-  async (details) => {
+  (details) => {
     const url = new URL(details.url);
     let initiator;
     if (details.originUrl)
@@ -101,26 +101,6 @@ browser.webRequest.onResponseStarted.addListener(
   { urls: ["<all_urls>"] }
 );
 
-browser.tabs.onUpdated.addListener((tabId, changeInfo, _) => {
-  let url;
-  try {
-    url = new URL(changeInfo.url)
-  } catch (_) {
-    return;
-  }
-  var protocolHost = `${url.protocol}//${url.host}`;
-
-  if (youtubeHelper.getRedirects().invidious.normal.includes(protocolHost)) {
-    if (youtubeHelper.getPersistInvidiousPrefs())
-      youtubeHelper.invidiousInitCookies(tabId);
-  }
-
-  var mightyList = getMightyList();
-
-  if (mightyList.includes(protocolHost)) browser.pageAction.show(tabId);
-});
-
-
 function changeInstance(url) {
   var tabUrl = new URL(url);
   var protocolHost = `${tabUrl.protocol}//${tabUrl.host}`;
@@ -164,9 +144,6 @@ function changeInstance(url) {
   if (newUrl) browser.tabs.update({ url: tabUrl.href.replace(protocolHost, newUrl) });
 }
 
-
-browser.pageAction.onClicked.addListener((tab) => changeInstance(tab.url));
-
 function getMightyList() {
   return [
     ...youtubeHelper.getCustomRedirects().invidious.normal,
diff --git a/src/pages/options/general/general.js b/src/pages/options/general/general.js
index de69a487..e6642bab 100644
--- a/src/pages/options/general/general.js
+++ b/src/pages/options/general/general.js
@@ -1,11 +1,11 @@
 "use strict";
+window.browser = window.browser || window.chrome;
 
 import commonHelper from "../../../assets/javascripts/helpers/common.js";
 import exceptionsHelper from "../../../assets/javascripts/helpers/exceptions.js";
 
 let themeElement = document.getElementById("theme");
 
-window.browser = window.browser || window.chrome;
 
 browser.storage.sync.get(
   ["theme"],
diff --git a/src/pages/options/init.js b/src/pages/options/init.js
index fdcca8e4..cabef5b2 100644
--- a/src/pages/options/init.js
+++ b/src/pages/options/init.js
@@ -1,3 +1,5 @@
+window.browser = window.browser || window.chrome;
+
 function changeTheme() {
     browser.storage.sync.get("theme", (result) => {
         switch (result.theme) {
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 28b3121c..fb46d96f 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -1,4 +1,5 @@
 "use strict";
+window.browser = window.browser || window.chrome;
 
 import commonHelper from "../../assets/javascripts/helpers/common.js";
 import youtubeHelper from "../../assets/javascripts/helpers/youtube/youtube.js";
@@ -25,8 +26,6 @@ let disableMediumElement = document.querySelector("#disable-medium");
 let disableImgurElement = document.querySelector("#disable-imgur");
 let disableTiktokElement = document.querySelector("#disable-tiktok");
 
-window.browser = window.browser || window.chrome;
-
 async function wholeInit() {
   await youtubeHelper.init();
   await twitterHelper.init();