diff --git a/pug/options/search/search.pug b/pug/options/search/search.pug index 61664b9c..3bdc6d7e 100644 --- a/pug/options/search/search.pug +++ b/pug/options/search/search.pug @@ -13,12 +13,11 @@ body.option(dir="auto") input#disable-search(type="checkbox") .some-block.option-block - h4#frontend(data-localise="__MSG_frontend__") Frontend + h4(data-localise="__MSG_frontend__") Frontend select#search-frontend - option(value="searx") SearX option(value="searxng") SearXNG + option(value="searx") SearX option(value="whoogle") Whoogle - option(value="startpage") Startpage #searx-whoogle 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 @@