From 0e817629d33521bb550d31ce25ff01c38527edc5 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Wed, 27 Apr 2022 20:50:59 +0300 Subject: Removed startpage as it has an extension #222 --- src/assets/javascripts/helpers/search.js | 12 +++--------- src/assets/javascripts/helpers/tiktok.js | 1 - src/pages/options/search/search.html | 5 ++--- src/pages/options/search/search.js | 11 ----------- 4 files changed, 5 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/assets/javascripts/helpers/search.js b/src/assets/javascripts/helpers/search.js index ab8c0f2d..0fab3a9d 100644 --- a/src/assets/javascripts/helpers/search.js +++ b/src/assets/javascripts/helpers/search.js @@ -25,10 +25,7 @@ let redirects = { "normal": [], "tor": [], "i2p": [] - }, - "startpage": { - "normal": "https://www.startpage.com", - }, + } }; const getRedirects = () => redirects; const getCustomRedirects = () => { @@ -430,14 +427,11 @@ function redirect(url) { randomInstance = commonHelper.getRandomInstance(instancesList) path = "/search"; } - else if (frontend == 'startpage') { - randomInstance = redirects.startpage.normal; - path = "/do/search"; - } + if ( ((url.hostname.includes('google') || url.hostname.includes('bing')) && !url.searchParams.has('q')) || (url.hostname.includes('yandex') && !url.searchParams.has('text')) - ) path = '/'; + ) path = '/'; let searchQuery = ""; diff --git a/src/assets/javascripts/helpers/tiktok.js b/src/assets/javascripts/helpers/tiktok.js index bd918495..6c941d25 100644 --- a/src/assets/javascripts/helpers/tiktok.js +++ b/src/assets/javascripts/helpers/tiktok.js @@ -174,7 +174,6 @@ async function initDefaults() { async function init() { return new Promise(resolve => { - console.log('redirects', redirects) browser.storage.local.get( [ "disableTiktok", diff --git a/src/pages/options/search/search.html b/src/pages/options/search/search.html index 01e8511e..cc1bb006 100644 --- a/src/pages/options/search/search.html +++ b/src/pages/options/search/search.html @@ -63,12 +63,11 @@
-

Frontend

+

Frontend

diff --git a/src/pages/options/search/search.js b/src/pages/options/search/search.js index 14834309..197b17f4 100644 --- a/src/pages/options/search/search.js +++ b/src/pages/options/search/search.js @@ -12,35 +12,24 @@ let whoogleDivElement = document.getElementById("whoogle"); function changeFrontendsSettings(frontend) { let SearxWhoogleElement = document.getElementById("searx-whoogle"); - let frontendElement = document.getElementById("frontend"); if (frontend == 'searx') { - frontendElement.innerHTML = 'Frontend'; searxDivElement.style.display = 'block'; searxngDivElement.style.display = 'none'; whoogleDivElement.style.display = 'none'; SearxWhoogleElement.style.display = 'block'; } else if (frontend == 'searxng') { - frontendElement.innerHTML = 'Frontend'; searxDivElement.style.display = 'none'; searxngDivElement.style.display = 'block'; whoogleDivElement.style.display = 'none'; SearxWhoogleElement.style.display = 'block'; } else if (frontend == 'whoogle') { - frontendElement.innerHTML = 'Frontend'; searxDivElement.style.display = 'none'; searxngDivElement.style.display = 'none'; whoogleDivElement.style.display = 'block'; SearxWhoogleElement.style.display = 'block'; } - else if (frontend == 'startpage') { - frontendElement.innerHTML = `Frontend: This is a centralized service`; - searxDivElement.style.display = 'none'; - searxngDivElement.style.display = 'none'; - whoogleDivElement.style.display = 'none'; - SearxWhoogleElement.style.display = 'none'; - } } let searchFrontendElement = document.getElementById("search-frontend"); searchFrontendElement.addEventListener("change", -- cgit 1.4.1