From ebc9bf35a60325330c6403fbd26987a0f864422b Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Sat, 21 May 2022 01:46:47 +0300 Subject: Cleaned code. Added shortcuts for the CopyRaw btn #268 --- src/pages/popup/popup.html | 5 +- src/pages/popup/popup.js | 124 ++------------------------------------------- src/pages/popup/popup.pug | 6 +-- src/pages/popup/style.css | 9 +--- 4 files changed, 12 insertions(+), 132 deletions(-) (limited to 'src/pages/popup') diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html index b4086ffd..b815bc1d 100644 --- a/src/pages/popup/popup.html +++ b/src/pages/popup/popup.html @@ -70,7 +70,7 @@

Translate

-
+ -
+
@@ -107,5 +107,6 @@

Unify Settings

+ \ No newline at end of file diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js index c6399aeb..e465a7e0 100644 --- a/src/pages/popup/popup.js +++ b/src/pages/popup/popup.js @@ -1,22 +1,7 @@ "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"; -import youtubeMusicHelper from "../../assets/javascripts/helpers/youtubeMusic.js"; -import twitterHelper from "../../assets/javascripts/helpers/twitter.js"; -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/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"; -import tiktokHelper from "../../assets/javascripts/helpers/tiktok.js"; -import sendTargetsHelper from "../../assets/javascripts/helpers/sendTargets.js"; -import peertubeHelper from "../../assets/javascripts/helpers/peertube.js"; -import lbryHelper from "../../assets/javascripts/helpers/lbry.js"; +import utils from "../../assets/javascripts/helpers/utils.js"; import generalHelper from "../../assets/javascripts/helpers/general.js"; let disableTwitterElement = document.getElementById("disable-nitter"); @@ -35,9 +20,6 @@ let disableSendTargetsElement = document.getElementById("disable-sendTargets"); let disableImgurElement = document.getElementById("disable-imgur"); let disableTiktokElement = document.getElementById("disable-tiktok"); -let copyRawElement = document.getElementById('copy_raw'); -let unifyElement = document.getElementById('unify'); - browser.storage.local.get( [ "disableTwitter", @@ -95,109 +77,13 @@ document.addEventListener("change", () => { }); }) -let changeInstanceElement = document.getElementById("change-instance") -changeInstanceElement.addEventListener("click", switchInstance); -copyRawElement.addEventListener("click", copyRaw); +document.getElementById("change_instance").addEventListener("click", utils.switchInstance); +document.getElementById('copy_raw').addEventListener("click", utils.copyRaw); document.getElementById("more-options").addEventListener("click", () => browser.runtime.openOptionsPage()); -unifyElement.addEventListener("click", unify) - -function unify() { - browser.tabs.query( - { active: true, currentWindow: true }, - async tabs => { - let currTab = tabs[0] - if (currTab) { - let url = new URL(currTab.url); - - let result = await youtubeHelper.initInvidiousCookies(url); - if (!result) result = await youtubeHelper.initPipedLocalStorage(url, currTab.id); - if (!result) result = await youtubeHelper.initPipedMaterialLocalStorage(url, currTab.id); - - if (!result) result = await twitterHelper.initNitterCookies(url); - - if (!result) result = await redditHelper.initLibredditCookies(url); - if (!result) result = await redditHelper.initTedditCookies(url); - - if (!result) result = await searchHelper.initSearxCookies(url); - if (!result) result = await searchHelper.initSearxngCookies(url); - - if (!result) result = await tiktokHelper.initProxiTokCookies(url); - - if (!result) result = await wikipediaHelper.initWikilessCookies(url); - - if (!result) result = await translateHelper.initSimplyTranslateCookies(url); - if (!result) result = await translateHelper.initLingvaLocalStorage(url); +document.getElementById('unify').addEventListener("click", unify); - if (result) { - const textElement = unifyElement.getElementsByTagName('h4')[0] - const oldHtml = textElement.innerHTML; - textElement.innerHTML = 'Unified'; - setTimeout(() => textElement.innerHTML = oldHtml, 1000); - } - } - } - ) -} - -function switchInstance() { - browser.tabs.query({ active: true, currentWindow: true }, async tabs => { - let currTab = tabs[0]; - if (currTab) { - let url = new URL(currTab.url); - let newUrl; - - // newUrl = youtubeHelper.switchInstance(url); - // if (!newUrl) newUrl = twitterHelper.switchInstance(url); - // if (!newUrl) newUrl = instagramHelper.switchInstance(url); - if (!newUrl) newUrl = await redditHelper.switchInstance(url); - // if (!newUrl) newUrl = searchHelper.switchInstance(url); - // if (!newUrl) newUrl = translateHelper.switchInstance(url); - // if (!newUrl) newUrl = mediumHelper.switchInstance(url); - // if (!newUrl) newUrl = sendTargetsHelper.switchInstance(url); - // if (!newUrl) newUrl = peertubeHelper.switchInstance(url); - // if (!newUrl) newUrl = lbryHelper.switchInstance(url); - // if (!newUrl) newUrl = imgurHelper.switchInstance(url); - // if (!newUrl) newUrl = wikipediaHelper.switchInstance(url); - - if (newUrl) { - browser.tabs.update({ url: newUrl }); - return true; - } - } - }) - return false; -} - -function copyRaw() { - browser.tabs.query( - { active: true, currentWindow: true }, tabs => { - let currTab = tabs[0]; - if (currTab) { - let url = new URL(currTab.url); - let newUrl; - newUrl = youtubeHelper.reverse(url); - - if (!newUrl) newUrl = twitterHelper.reverse(url); - if (!newUrl) newUrl = instagramHelper.reverse(url); - if (!newUrl) newUrl = tiktokHelper.reverse(url); - if (!newUrl) newUrl = imgurHelper.reverse(url); - - if (newUrl) { - navigator.clipboard.writeText(newUrl); - const textElement = copyRawElement.getElementsByTagName('h4')[0] - const oldHtml = textElement.innerHTML; - textElement.innerHTML = 'Copied'; - setTimeout(() => textElement.innerHTML = oldHtml, 1000); - } - } - } - ) -} - -let popupFrontends; generalHelper.init().then(() => { - popupFrontends = generalHelper.getPopupFrontends(); - + let popupFrontends = generalHelper.getPopupFrontends(); for (const frontend of generalHelper.allPopupFrontends) if (!popupFrontends.includes(frontend)) document.getElementById(frontend).classList.add("hide") diff --git a/src/pages/popup/popup.pug b/src/pages/popup/popup.pug index 31354a4b..97f6d045 100644 --- a/src/pages/popup/popup.pug +++ b/src/pages/popup/popup.pug @@ -87,7 +87,7 @@ html(lang="en") input#disable-simplyTranslate(type="checkbox") #maps.some-block - a.title(href="https://maps.com") + a.title(href="https://www.openstreetmap.org") +maps h4 Maps input#disable-osm(type="checkbox") @@ -99,7 +99,7 @@ html(lang="en") input#disable-sendTargets(type="checkbox") .some-block - a#change-instance.title.button + a#change_instance.title.button +change_instance h4 Change Instance @@ -120,4 +120,4 @@ html(lang="en") script(type="module" src="../options/init.js") script(type="module" src="./popup.js") - //- script(src="../../assets/javascripts/localise.js") \ No newline at end of file + script(src="../../assets/javascripts/localise.js") \ No newline at end of file diff --git a/src/pages/popup/style.css b/src/pages/popup/style.css index 6cd91b92..4cc56145 100644 --- a/src/pages/popup/style.css +++ b/src/pages/popup/style.css @@ -9,11 +9,4 @@ html, body { .hide { display: none !important; -} - -.button { - margin: auto; - width: 50%; - border: 3px rgb(180, 201, 180); - padding: 10px; - } \ No newline at end of file +} \ No newline at end of file -- cgit 1.4.1