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/search/search.html | 379 ++++++++++++++++++++--------------- src/pages/options/search/search.js | 75 ++++++- 2 files changed, 286 insertions(+), 168 deletions(-) (limited to 'src/pages/options/search') 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 -
-
- - + d="M21,5c-1.11-0.35-2.33-0.5-3.5-0.5c-1.95,0-4.05,0.4-5.5,1.5c-1.45-1.1-3.55-1.5-5.5-1.5S2.45,4.9,1,6v14.65 c0,0.25,0.25,0.5,0.5,0.5c0.1,0,0.15-0.05,0.25-0.05C3.1,20.45,5.05,20,6.5,20c1.95,0,4.05,0.4,5.5,1.5c1.35-0.85,3.8-1.5,5.5-1.5 c1.65,0,3.35,0.3,4.75,1.05c0.1,0.05,0.15,0.05,0.25,0.05c0.25,0,0.5-0.25,0.5-0.5V6C22.4,5.55,21.75,5.25,21,5z M21,18.5 c-1.1-0.35-2.3-0.5-3.5-0.5c-1.7,0-4.15,0.65-5.5,1.5V8c1.35-0.85,3.8-1.5,5.5-1.5c1.2,0,2.4,0.15,3.5,0.5V18.5z" /> + + + + + + + + + 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 + ); }); -- cgit 1.4.1