Added theme support to many frontends #80. Fixed bugs

3 files changed, 6 insertions, 6 deletions

diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index d019fa28..1822f2b9 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -5,7 +5,7 @@ import twitterHelper from "../../assets/javascripts/helpers/twitter.js";
 import instagramHelper from "../../assets/javascripts/helpers/instagram.js";
 import redditHelper from "../../assets/javascripts/helpers/reddit.js";
 import searchHelper from "../../assets/javascripts/helpers/search.js";
-import translateHelper from "../../assets/javascripts/helpers/translate.js";
+import translateHelper from "../../assets/javascripts/helpers/translate/translate.js";
 import mapsHelper from "../../assets/javascripts/helpers/maps.js";
 import wikipediaHelper from "../../assets/javascripts/helpers/wikipedia.js";
 import mediumHelper from "../../assets/javascripts/helpers/medium.js";
@@ -74,11 +74,11 @@ browser.webRequest.onBeforeRequest.addListener(
 
     if (!newUrl) newUrl = sendTargetsHelper.redirect(url, details.type, initiator);
 
-    if (translateHelper.isTranslate(url, initiator)) newUrl = translateHelper.redirect(url);
+    if (!newUrl) newUrl = translateHelper.redirect(url);
 
     if (!newUrl) newUrl = searchHelper.redirect(url)
 
-    if (wikipediaHelper.isWikipedia(url, initiator)) newUrl = wikipediaHelper.redirect(url);
+    if (!newUrl) newUrl = wikipediaHelper.redirect(url);
 
     if (generalHelper.isException(url, initiator)) newUrl = null;
 
@@ -115,7 +115,6 @@ browser.tabs.onRemoved.addListener((tabId) => {
 
 browser.webRequest.onResponseStarted.addListener(
   details => {
-    console.log("onResponseStarted");
     let autoRedirect = generalHelper.getAutoRedirect();
 
     if (!autoRedirect) return null;
@@ -158,6 +157,7 @@ browser.tabs.onUpdated.addListener(
     try { url = new URL(changeInfo.url); }
     catch (_) { return }
     if (youtubeHelper.isPipedorInvidious(url, 'main_frame', 'piped')) youtubeHelper.initPipedLocalStorage(tabId);
+    if (translateHelper.isTranslateRedirects(url, 'main_frame', 'lingva')) translateHelper.initLingvaLocalStorage(tabId);
     if (instagramHelper.isBibliogram(url)) instagramHelper.initBibliogramCookies(url);
     // if (changeInfo.url && youtubeHelper.isPipedorInvidious(url, 'main_frame', 'pipedMaterial')) youtubeHelper.initPipedMaterialLocalStorage(tabId);
   });
\ No newline at end of file
diff --git a/src/pages/options/translate/translate.js b/src/pages/options/translate/translate.js
index 215fc71b..d1df35ab 100644
--- a/src/pages/options/translate/translate.js
+++ b/src/pages/options/translate/translate.js
@@ -1,4 +1,4 @@
-import translateHelper from "../../../assets/javascripts/helpers/translate.js";
+import translateHelper from "../../../assets/javascripts/helpers/translate/translate.js";
 import commonHelper from "../../../assets/javascripts/helpers/common.js";
 
 let disableElement = document.getElementById("disable-simplyTranslate");
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index d03809ec..3b4f4161 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -9,7 +9,7 @@ import instagramHelper from "../../assets/javascripts/helpers/instagram.js";
 import mapsHelper from "../../assets/javascripts/helpers/maps.js";
 import redditHelper from "../../assets/javascripts/helpers/reddit.js";
 import searchHelper from "../../assets/javascripts/helpers/search.js";
-import translateHelper from "../../assets/javascripts/helpers/translate.js";
+import translateHelper from "../../assets/javascripts/helpers/translate/translate.js";
 import wikipediaHelper from "../../assets/javascripts/helpers/wikipedia.js";
 import mediumHelper from "../../assets/javascripts/helpers/medium.js";
 import imgurHelper from "../../assets/javascripts/helpers/imgur.js";