LibRedirect Options: Search

From 384950d34819996e3848ce106db1288537c32793 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Sun, 20 Feb 2022 22:47:13 +0300 Subject: Completing on supporting tor #32 --- src/pages/options/imgur/imgur.html | 10 +- src/pages/options/imgur/imgur.js | 8 +- src/pages/options/instagram/instagram.html | 10 +- src/pages/options/instagram/instagram.js | 8 +- src/pages/options/medium/medium.html | 10 +- src/pages/options/medium/medium.js | 8 +- src/pages/options/reddit/reddit.html | 20 +- src/pages/options/reddit/reddit.js | 16 +- src/pages/options/search/search.html | 379 +++++++++++++++++------------ src/pages/options/search/search.js | 75 +++++- src/pages/options/tiktok/tiktok.html | 10 +- src/pages/options/tiktok/tiktok.js | 8 +- src/pages/options/translate/translate.html | 23 +- src/pages/options/translate/translate.js | 16 +- src/pages/options/wikipedia/wikipedia.html | 10 +- src/pages/options/wikipedia/wikipedia.js | 8 +- 16 files changed, 369 insertions(+), 250 deletions(-) (limited to 'src/pages/options') diff --git a/src/pages/options/imgur/imgur.html b/src/pages/options/imgur/imgur.html index 5f3b1263..405cf6a1 100644 --- a/src/pages/options/imgur/imgur.html +++ b/src/pages/options/imgur/imgur.html @@ -118,15 +118,15 @@

Default Instances

Custom Instances

- -

diff --git a/src/pages/options/imgur/imgur.js b/src/pages/options/imgur/imgur.js index 1ff9bae0..2c190591 100644 --- a/src/pages/options/imgur/imgur.js +++ b/src/pages/options/imgur/imgur.js @@ -14,9 +14,9 @@ imgurHelper.init().then(() => { 'normal', imgurHelper, document, - imgurHelper.getRimgoRedirectsChecks, - imgurHelper.setRimgoRedirectsChecks, - imgurHelper.getRimgoCustomRedirects, - imgurHelper.setRimgoCustomRedirects + imgurHelper.getRimgoNormalRedirectsChecks, + imgurHelper.setRimgoNormalRedirectsChecks, + imgurHelper.getRimgoNormalCustomRedirects, + imgurHelper.setRimgoNormalCustomRedirects ) }) \ No newline at end of file diff --git a/src/pages/options/instagram/instagram.html b/src/pages/options/instagram/instagram.html index a78a8a51..6a53fca3 100644 --- a/src/pages/options/instagram/instagram.html +++ b/src/pages/options/instagram/instagram.html @@ -119,15 +119,15 @@

Default Instances

Custom Instances

- -

diff --git a/src/pages/options/instagram/instagram.js b/src/pages/options/instagram/instagram.js index 632ee0bb..9cfb8491 100644 --- a/src/pages/options/instagram/instagram.js +++ b/src/pages/options/instagram/instagram.js @@ -14,9 +14,9 @@ instagramHelper.init().then(() => { 'normal', instagramHelper, document, - instagramHelper.getBibliogramRedirectsChecks, - instagramHelper.setBibliogramRedirectsChecks, - instagramHelper.getBibliogramCustomRedirects, - instagramHelper.setBibliogramCustomRedirects + instagramHelper.getBibliogramNormalRedirectsChecks, + instagramHelper.setBibliogramNormalRedirectsChecks, + instagramHelper.getBibliogramNormalCustomRedirects, + instagramHelper.setBibliogramNormalCustomRedirects ) }) \ No newline at end of file diff --git a/src/pages/options/medium/medium.html b/src/pages/options/medium/medium.html index 13478636..9efd21cc 100644 --- a/src/pages/options/medium/medium.html +++ b/src/pages/options/medium/medium.html @@ -118,15 +118,15 @@

Default Instances

Custom Instances

- -

diff --git a/src/pages/options/medium/medium.js b/src/pages/options/medium/medium.js index cb69fecb..8c302fc2 100644 --- a/src/pages/options/medium/medium.js +++ b/src/pages/options/medium/medium.js @@ -14,9 +14,9 @@ mediumHelper.init().then(() => { 'normal', mediumHelper, document, - mediumHelper.getScribeRedirectsChecks, - mediumHelper.setScribeRedirectsChecks, - mediumHelper.getScribeCustomRedirects, - mediumHelper.setScribeCustomRedirects + mediumHelper.getScribeNormalRedirectsChecks, + mediumHelper.setScribeNormalRedirectsChecks, + mediumHelper.getScribeNormalCustomRedirects, + mediumHelper.setScribeNormalCustomRedirects ) }) \ No newline at end of file diff --git a/src/pages/options/reddit/reddit.html b/src/pages/options/reddit/reddit.html index 2394f665..98ec6754 100644 --- a/src/pages/options/reddit/reddit.html +++ b/src/pages/options/reddit/reddit.html @@ -136,16 +136,16 @@

Default Instances

Custom Instances

- -

Default Instances

Custom Instances

- -

diff --git a/src/pages/options/reddit/reddit.js b/src/pages/options/reddit/reddit.js index e84f3a6e..52f3245b 100644 --- a/src/pages/options/reddit/reddit.js +++ b/src/pages/options/reddit/reddit.js @@ -40,10 +40,10 @@ redditHelper.init().then(() => { 'normal', redditHelper, document, - redditHelper.getLibredditRedirectsChecks, - redditHelper.setLibredditRedirectsChecks, - redditHelper.getLibredditCustomRedirects, - redditHelper.setLibredditCustomRedirects + redditHelper.getLibredditNormalRedirectsChecks, + redditHelper.setLibredditNormalRedirectsChecks, + redditHelper.getLibredditNormalCustomRedirects, + redditHelper.setLibredditNormalCustomRedirects ) commonHelper.processDefaultCustomInstances( @@ -51,10 +51,10 @@ redditHelper.init().then(() => { 'normal', redditHelper, document, - redditHelper.getTedditRedirectsChecks, - redditHelper.setTedditRedirectsChecks, - redditHelper.getTedditCustomRedirects, - redditHelper.setTedditCustomRedirects + redditHelper.getTedditNormalRedirectsChecks, + redditHelper.setTedditNormalRedirectsChecks, + redditHelper.getTedditNormalCustomRedirects, + redditHelper.setTedditNormalCustomRedirects ); }) \ No newline at end of file diff --git a/src/pages/options/search/search.html b/src/pages/options/search/search.html index 12cb3c9a..48abe35e 100644 --- a/src/pages/options/search/search.html +++ b/src/pages/options/search/search.html @@ -2,181 +2,244 @@ - - - - - - LibRedirect Options: Search + + + + + + LibRedirect Options: Search -

- - General -

- YouTube -

- Twitter -

- Instagram -

- TikTok -

- Reddit -

- Imgur -

+ + General +

+ YouTube +

+ Twitter +

+ Instagram +

+ TikTok +

+ Reddit +

+ Imgur +

+ + Search +

+ + Translate +

+ + Maps +

+ - Search -

- + Wikipedia +

+ - Translate + d="M19,5v14H5V5H19 M19,3H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5C21,3.9,20.1,3,19,3L19,3z" /> + + + + + Medium +

+ +

Enable

+ +

Frontend

+ +

Protocol

+ +

Default Instances

- - Maps +

- - Wikipedia +

Custom Instances

+ +

Default Instances

- - Medium +

Custom Instances

+ +

+ -

+ +

Enable

- +

Default Instances

Frontend

- +

Custom Instances

+ +

Default Instances

Custom Instances

- -

Default Instances

Custom Instances

+ +

Default Instances

Custom Instances

- -

+ - - - - + + + - + \ No newline at end of file diff --git a/src/pages/options/search/search.js b/src/pages/options/search/search.js index d52c8600..a240c059 100644 --- a/src/pages/options/search/search.js +++ b/src/pages/options/search/search.js @@ -30,31 +30,86 @@ searchFrontendElement.addEventListener("change", } ); +let protocolElement = document.getElementById("protocol") +protocolElement.addEventListener("change", + (event) => { + let protocol = event.target.options[protocolElement.selectedIndex].value + searchHelper.setProtocol(protocol); + changeProtocolSettings(protocol); + } +); + +function changeProtocolSettings(protocol) { + let normalsearxDiv = document.getElementById("searx-normal"); + let torsearxDiv = document.getElementById("searx-tor"); + + let normalwhoogleDiv = document.getElementById("whoogle-normal"); + let torwhoogleDiv = document.getElementById("whoogle-tor"); + if (protocol == 'normal') { + normalsearxDiv.style.display = 'block'; + normalwhoogleDiv.style.display = 'block'; + torwhoogleDiv.style.display = 'none'; + torsearxDiv.style.display = 'none'; + } + else if (protocol == 'tor') { + normalsearxDiv.style.display = 'none'; + normalwhoogleDiv.style.display = 'none'; + torwhoogleDiv.style.display = 'block'; + torsearxDiv.style.display = 'block'; + } +} + searchHelper.init().then(() => { disableSearchElement.checked = !searchHelper.getDisable(); let frontend = searchHelper.getFrontend(); searchFrontendElement.value = frontend; changeFrontendsSettings(frontend); + let protocol = searchHelper.getprotocol(); + protocolElement.value = protocol; + changeProtocolSettings(protocol); + commonHelper.processDefaultCustomInstances( 'searx', 'normal', searchHelper, document, - searchHelper.getSearxRedirectsChecks, - searchHelper.setSearxRedirectsChecks, - searchHelper.getSearxCustomRedirects, - searchHelper.setSearxCustomRedirects - ) + searchHelper.getSearxNormalRedirectsChecks, + searchHelper.setSearxNormalRedirectsChecks, + searchHelper.getSearxNormalCustomRedirects, + searchHelper.setSearxNormalCustomRedirects + ); + + commonHelper.processDefaultCustomInstances( + 'searx', + 'tor', + searchHelper, + document, + searchHelper.getSearxTorRedirectsChecks, + searchHelper.setSearxTorRedirectsChecks, + searchHelper.getSearxTorCustomRedirects, + searchHelper.setSearxTorCustomRedirects + ); commonHelper.processDefaultCustomInstances( 'whoogle', 'normal', searchHelper, document, - searchHelper.getWhoogleRedirectsChecks, - searchHelper.setWhoogleRedirectsChecks, - searchHelper.getWhoogleCustomRedirects, - searchHelper.setWhoogleCustomRedirects - ) + searchHelper.getWhoogleNormalRedirectsChecks, + searchHelper.setWhoogleNormalRedirectsChecks, + searchHelper.getWhoogleNormalCustomRedirects, + searchHelper.setWhoogleNormalCustomRedirects + ); + + commonHelper.processDefaultCustomInstances( + 'whoogle', + 'tor', + searchHelper, + document, + searchHelper.getWhoogleTorRedirectsChecks, + searchHelper.setWhoogleTorRedirectsChecks, + searchHelper.getWhoogleTorCustomRedirects, + searchHelper.setWhoogleTorCustomRedirects + ); }); diff --git a/src/pages/options/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html index f8df73dd..8bec525f 100644 --- a/src/pages/options/tiktok/tiktok.html +++ b/src/pages/options/tiktok/tiktok.html @@ -118,15 +118,15 @@

Default Instances

Custom Instances

- -

diff --git a/src/pages/options/tiktok/tiktok.js b/src/pages/options/tiktok/tiktok.js index 34db3dd9..d66d0453 100644 --- a/src/pages/options/tiktok/tiktok.js +++ b/src/pages/options/tiktok/tiktok.js @@ -14,9 +14,9 @@ tiktokHelper.init().then(() => { 'normal', tiktokHelper, document, - tiktokHelper.getProxiTokRedirectsChecks, - tiktokHelper.setProxiTokRedirectsChecks, - tiktokHelper.getProxiTokCustomRedirects, - tiktokHelper.setProxiTokCustomRedirects + tiktokHelper.getProxiTokNormalRedirectsChecks, + tiktokHelper.setProxiTokNormalRedirectsChecks, + tiktokHelper.getProxiTokNormalCustomRedirects, + tiktokHelper.setProxiTokNormalCustomRedirects ) }) \ No newline at end of file diff --git a/src/pages/options/translate/translate.html b/src/pages/options/translate/translate.html index a918fcb6..4ef26221 100644 --- a/src/pages/options/translate/translate.html +++ b/src/pages/options/translate/translate.html @@ -357,16 +357,17 @@

Default Instances

Custom Instances

- -

Default Instances

Custom Instances

- -

@@ -410,4 +411,4 @@ - + \ No newline at end of file diff --git a/src/pages/options/translate/translate.js b/src/pages/options/translate/translate.js index ad9e52a5..266814b1 100644 --- a/src/pages/options/translate/translate.js +++ b/src/pages/options/translate/translate.js @@ -61,10 +61,10 @@ translateHelper.init().then(() => { 'normal', translateHelper, document, - translateHelper.getSimplyTranslateRedirectsChecks, - translateHelper.setSimplyTranslateRedirectsChecks, - translateHelper.getSimplyTranslateCustomRedirects, - translateHelper.setSimplyTranslateCustomRedirects + translateHelper.getSimplyTranslateNormalRedirectsChecks, + translateHelper.setSimplyTranslateNormalRedirectsChecks, + translateHelper.getSimplyTranslateNormalCustomRedirects, + translateHelper.setSimplyTranslateNormalCustomRedirects ) commonHelper.processDefaultCustomInstances( @@ -72,9 +72,9 @@ translateHelper.init().then(() => { 'normal', translateHelper, document, - translateHelper.getLingvaRedirectsChecks, - translateHelper.setLingvaRedirectsChecks, - translateHelper.getLingvaCustomRedirects, - translateHelper.setLingvaCustomRedirects + translateHelper.getLingvaNormalRedirectsChecks, + translateHelper.setLingvaNormalRedirectsChecks, + translateHelper.getLingvaNormalCustomRedirects, + translateHelper.setLingvaNormalCustomRedirects ) }); \ No newline at end of file diff --git a/src/pages/options/wikipedia/wikipedia.html b/src/pages/options/wikipedia/wikipedia.html index e24e118c..5f844ebc 100644 --- a/src/pages/options/wikipedia/wikipedia.html +++ b/src/pages/options/wikipedia/wikipedia.html @@ -117,16 +117,16 @@

Default Instances

Custom Instances

- -

diff --git a/src/pages/options/wikipedia/wikipedia.js b/src/pages/options/wikipedia/wikipedia.js index 161f0af4..29a75f72 100644 --- a/src/pages/options/wikipedia/wikipedia.js +++ b/src/pages/options/wikipedia/wikipedia.js @@ -13,9 +13,9 @@ wikipediaHelper.init().then(() => { 'normal', wikipediaHelper, document, - wikipediaHelper.getWikilessRedirectsChecks, - wikipediaHelper.setWikilessRedirectsChecks, - wikipediaHelper.getWikilessCustomRedirects, - wikipediaHelper.setWikilessCustomRedirects + wikipediaHelper.getWikilessNormalRedirectsChecks, + wikipediaHelper.setWikilessNormalRedirectsChecks, + wikipediaHelper.getWikilessNormalCustomRedirects, + wikipediaHelper.setWikilessNormalCustomRedirects ) }) \ No newline at end of file -- cgit 1.4.1