diff options
Diffstat (limited to '')
| -rw-r--r-- | src/pages/options/imgur/imgur.html | 10 | ||||
| -rw-r--r-- | src/pages/options/imgur/imgur.js | 8 | ||||
| -rw-r--r-- | src/pages/options/instagram/instagram.html | 10 | ||||
| -rw-r--r-- | src/pages/options/instagram/instagram.js | 8 | ||||
| -rw-r--r-- | src/pages/options/medium/medium.html | 10 | ||||
| -rw-r--r-- | src/pages/options/medium/medium.js | 8 | ||||
| -rw-r--r-- | src/pages/options/reddit/reddit.html | 20 | ||||
| -rw-r--r-- | src/pages/options/reddit/reddit.js | 16 | ||||
| -rw-r--r-- | src/pages/options/search/search.html | 377 | ||||
| -rw-r--r-- | src/pages/options/search/search.js | 75 | ||||
| -rw-r--r-- | src/pages/options/tiktok/tiktok.html | 10 | ||||
| -rw-r--r-- | src/pages/options/tiktok/tiktok.js | 8 | ||||
| -rw-r--r-- | src/pages/options/translate/translate.html | 23 | ||||
| -rw-r--r-- | src/pages/options/translate/translate.js | 16 | ||||
| -rw-r--r-- | src/pages/options/wikipedia/wikipedia.html | 10 | ||||
| -rw-r--r-- | src/pages/options/wikipedia/wikipedia.js | 8 |
16 files changed, 368 insertions, 249 deletions
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 @@ <div class="some-block option-block"> <h4>Default Instances</h4> </div> - <div class="checklist" id="rimgo-checklist"></div> + <div class="checklist" id="rimgo-normal-checklist"></div> <hr> <div class="some-block option-block"> <h4>Custom Instances</h4> </div> - <form id="custom-rimgo-instance-form"> + <form id="custom-rimgo-normal-instance-form"> <div class="some-block option-block"> - <input id="rimgo-custom-instance" placeholder="https://rimgo.com" type="url" /> - <button type="submit" class="add" id="rimgo-add-instance"> + <input id="rimgo-normal-custom-instance" placeholder="https://rimgo.com" type="url" /> + <button type="submit" class="add" id="rimgo-normal-add-instance"> <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -135,7 +135,7 @@ </button> </div> </form> - <div class="checklist" id="rimgo-custom-checklist"></div> + <div class="checklist" id="rimgo-normal-custom-checklist"></div> </section> 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 @@ <div class="some-block option-block"> <h4>Default Instances</h4> </div> - <div class="checklist" id="bibliogram-checklist"></div> + <div class="checklist" id="bibliogram-normal-checklist"></div> <hr> <div class="some-block option-block"> <h4>Custom Instances</h4> </div> - <form id="custom-bibliogram-instance-form"> + <form id="custom-bibliogram-normal-instance-form"> <div class="some-block option-block"> - <input id="bibliogram-custom-instance" placeholder="https://bibliogram.com" type="url" /> - <button type="submit" class="add" id="bibliogram-add-instance"> + <input id="bibliogram-normal-custom-instance" placeholder="https://bibliogram.com" type="url" /> + <button type="submit" class="add" id="bibliogram-normal-add-instance"> <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -136,7 +136,7 @@ </button> </div> </form> - <div class="checklist" id="bibliogram-custom-checklist"></div> + <div class="checklist" id="bibliogram-normal-custom-checklist"></div> </section> <script type="module" src="../init.js"></script> 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 @@ <div class="some-block option-block"> <h4>Default Instances</h4> </div> - <div class="checklist" id="scribe-checklist"></div> + <div class="checklist" id="scribe-normal-checklist"></div> <hr> <div class="some-block option-block"> <h4>Custom Instances</h4> </div> - <form id="custom-scribe-instance-form"> + <form id="custom-scribe-normal-instance-form"> <div class="some-block option-block"> - <input id="scribe-custom-instance" placeholder="https://scribe.com" type="url" /> - <button type="submit" class="add" id="scribe-add-instance"> + <input id="scribe-normal-custom-instance" placeholder="https://scribe.com" type="url" /> + <button type="submit" class="add" id="scribe-normal-add-instance"> <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -135,7 +135,7 @@ </button> </div> </form> - <div class="checklist" id="scribe-custom-checklist"></div> + <div class="checklist" id="scribe-normal-custom-checklist"></div> </section> 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 @@ <div class="some-block option-block"> <h4>Default Instances</h4> </div> - <div class="checklist" id="libreddit-checklist"> + <div class="checklist" id="libreddit-normal-checklist"> </div> <hr> <div class="some-block option-block"> <h4>Custom Instances</h4> </div> - <form id="custom-libreddit-instance-form"> + <form id="custom-libreddit-normal-instance-form"> <div class="some-block option-block"> - <input id="libreddit-custom-instance" placeholder="https://libreddit.com" type="url" /> - <button type="submit" class="add" id="libreddit-add-instance"> + <input id="libreddit-normal-custom-instance" placeholder="https://libreddit.com" type="url" /> + <button type="submit" class="add" id="libreddit-normal-add-instance"> <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -154,23 +154,23 @@ </button> </div> </form> - <div class="checklist" id="libreddit-custom-checklist"></div> + <div class="checklist" id="libreddit-normal-custom-checklist"></div> </div> <div id="teddit"> <div class="some-block option-block"> <h4>Default Instances</h4> </div> - <div class="checklist" id="teddit-checklist"> + <div class="checklist" id="teddit-normal-checklist"> </div> <hr> <div class="some-block option-block"> <h4>Custom Instances</h4> </div> - <form id="custom-teddit-instance-form"> + <form id="custom-teddit-normal-instance-form"> <div class="some-block option-block"> - <input id="teddit-custom-instance" placeholder="https://teddit.com" type="url" /> - <button type="submit" class="add" id="teddit-add-instance"> + <input id="teddit-normal-custom-instance" placeholder="https://teddit.com" type="url" /> + <button type="submit" class="add" id="teddit-normal-add-instance"> <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -179,7 +179,7 @@ </button> </div> </form> - <div class="checklist" id="teddit-custom-checklist"></div> + <div class="checklist" id="teddit-normal-custom-checklist"></div> </div> </section> 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 @@ <html lang="en"> <head> - <meta charset="UTF-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg" /> - <link href="../../stylesheets/styles.css" rel="stylesheet" /> - <title>LibRedirect Options: Search</title> + <meta charset="UTF-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg" /> + <link href="../../stylesheets/styles.css" rel="stylesheet" /> + <title>LibRedirect Options: Search</title> </head> <body class="option"> - <section class="links"> - <div class="title"> - <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> - <path d="M12 5.69l5 4.5V18h-2v-6H9v6H7v-7.81l5-4.5M12 3L2 12h3v8h6v-6h2v6h6v-8h3L12 3z" /> - </svg> - <a href="../general/general.html">General</a> - </div> - <div class="title"> - <img src="../../../assets/images/youtube-icon.png" /> - <a href="../youtube/youtube.html">YouTube</a> - </div> - <div class="title"> - <img src="../../../assets/images/twitter-icon.png" /> - <a href="../twitter/twitter.html">Twitter</a> - </div> - <div class="title"> - <img src="../../../assets/images/instagram-icon.png" /> - <a href="../instagram/instagram.html">Instagram</a> - </div> - <div class="title"> - <img src="../../../assets/images/tiktok-icon.png" /> - <a href="../tiktok/tiktok.html">TikTok</a> - </div> - <div class="title"> - <img src="../../../assets/images/reddit-icon.png" /> - <a href="../reddit/reddit.html">Reddit</a> - </div> - <div class="title"> - <img src="../../../assets/images/imgur-icon.png" /> - <a href="../imgur/imgur.html">Imgur</a> - </div> - <div class="title"> - <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> - <path - d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" /> - </svg> - <a href="../search/search.html" class="selected">Search</a> - </div> - <div class="title"> - <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> + <section class="links"> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path d="M12 5.69l5 4.5V18h-2v-6H9v6H7v-7.81l5-4.5M12 3L2 12h3v8h6v-6h2v6h6v-8h3L12 3z" /> + </svg> + <a href="../general/general.html">General</a> + </div> + <div class="title"> + <img src="../../../assets/images/youtube-icon.png" /> + <a href="../youtube/youtube.html">YouTube</a> + </div> + <div class="title"> + <img src="../../../assets/images/twitter-icon.png" /> + <a href="../twitter/twitter.html">Twitter</a> + </div> + <div class="title"> + <img src="../../../assets/images/instagram-icon.png" /> + <a href="../instagram/instagram.html">Instagram</a> + </div> + <div class="title"> + <img src="../../../assets/images/tiktok-icon.png" /> + <a href="../tiktok/tiktok.html">TikTok</a> + </div> + <div class="title"> + <img src="../../../assets/images/reddit-icon.png" /> + <a href="../reddit/reddit.html">Reddit</a> + </div> + <div class="title"> + <img src="../../../assets/images/imgur-icon.png" /> + <a href="../imgur/imgur.html">Imgur</a> + </div> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path + d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" /> + </svg> + <a href="../search/search.html" class="selected">Search</a> + </div> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path + d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z" /> + </svg> + <a href="../translate/translate.html">Translate</a> + </div> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path + d="M20.5 3l-.16.03L15 5.1 9 3 3.36 4.9c-.21.07-.36.25-.36.48V20.5c0 .28.22.5.5.5l.16-.03L9 18.9l6 2.1 5.64-1.9c.21-.07.36-.25.36-.48V3.5c0-.28-.22-.5-.5-.5zM10 5.47l4 1.4v11.66l-4-1.4V5.47zm-5 .99l3-1.01v11.7l-3 1.16V6.46zm14 11.08l-3 1.01V6.86l3-1.16v11.84z" /> + </svg> + <a href="../maps/maps.html">Maps</a> + </div> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" + width="24px" fill="currentColor"> + <g> + <rect fill="none" height="24" width="24" /> + </g> + <g> + <g /> + <g> <path - d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z" /> - </svg> - <a href="../translate/translate.html">Translate</a> - </div> - <div class="title"> - <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> - <path - d="M20.5 3l-.16.03L15 5.1 9 3 3.36 4.9c-.21.07-.36.25-.36.48V20.5c0 .28.22.5.5.5l.16-.03L9 18.9l6 2.1 5.64-1.9c.21-.07.36-.25.36-.48V3.5c0-.28-.22-.5-.5-.5zM10 5.47l4 1.4v11.66l-4-1.4V5.47zm-5 .99l3-1.01v11.7l-3 1.16V6.46zm14 11.08l-3 1.01V6.86l3-1.16v11.84z" /> - </svg> - <a href="../maps/maps.html">Maps</a> - </div> - <div class="title"> - <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" - width="24px" fill="currentColor"> - <g> - <rect fill="none" height="24" width="24" /> - </g> + 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" /> <g> - <g /> - <g> - <path - 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" /> - <g> - <path - d="M17.5,10.5c0.88,0,1.73,0.09,2.5,0.26V9.24C19.21,9.09,18.36,9,17.5,9c-1.7,0-3.24,0.29-4.5,0.83v1.66 C14.13,10.85,15.7,10.5,17.5,10.5z" /> - <path - d="M13,12.49v1.66c1.13-0.64,2.7-0.99,4.5-0.99c0.88,0,1.73,0.09,2.5,0.26V11.9c-0.79-0.15-1.64-0.24-2.5-0.24 C15.8,11.66,14.26,11.96,13,12.49z" /> - <path - d="M17.5,14.33c-1.7,0-3.24,0.29-4.5,0.83v1.66c1.13-0.64,2.7-0.99,4.5-0.99c0.88,0,1.73,0.09,2.5,0.26v-1.52 C19.21,14.41,18.36,14.33,17.5,14.33z" /> - </g> - </g> + <path + d="M17.5,10.5c0.88,0,1.73,0.09,2.5,0.26V9.24C19.21,9.09,18.36,9,17.5,9c-1.7,0-3.24,0.29-4.5,0.83v1.66 C14.13,10.85,15.7,10.5,17.5,10.5z" /> + <path + d="M13,12.49v1.66c1.13-0.64,2.7-0.99,4.5-0.99c0.88,0,1.73,0.09,2.5,0.26V11.9c-0.79-0.15-1.64-0.24-2.5-0.24 C15.8,11.66,14.26,11.96,13,12.49z" /> + <path + d="M17.5,14.33c-1.7,0-3.24,0.29-4.5,0.83v1.66c1.13-0.64,2.7-0.99,4.5-0.99c0.88,0,1.73,0.09,2.5,0.26v-1.52 C19.21,14.41,18.36,14.33,17.5,14.33z" /> </g> - </svg> - <a href="../wikipedia/wikipedia.html">Wikipedia</a> + </g> + </g> + </svg> + <a href="../wikipedia/wikipedia.html">Wikipedia</a> + </div> + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" + width="24px" fill="currentColor"> + <g> + <rect fill="none" height="24" width="24" /> + <g> + <path + 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" /> + </g> + <path d="M14,17H7v-2h7V17z M17,13H7v-2h10V13z M17,9H7V7h10V9z" /> + </g> + </svg> + <a href="../medium/medium.html">Medium</a> + </div> + </section> + + <section class="option-block"> + <div class="some-block option-block"> + <h4>Enable</h4> + <input id="disable-search" type="checkbox" checked /> + </div> + <div class="some-block option-block"> + <h4>Frontend</h4> + <select id="search-frontend"> + <option value="searx">SearX</option> + <option value="whoogle">Whoogle</option> + </select> + </div> + + <div class="some-block option-block"> + <h4>Protocol</h4> + <select id="protocol"> + <option value="normal">Normal</option> + <option value="tor">Tor</option> + </select> + </div> + + <hr> + + <div id="searx"> + <div id="searx-normal"> + <div class="some-block option-block"> + <h4>Default Instances</h4> </div> - <div class="title"> - <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" - width="24px" fill="currentColor"> - <g> - <rect fill="none" height="24" width="24" /> - <g> - <path - 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" /> - </g> - <path d="M14,17H7v-2h7V17z M17,13H7v-2h10V13z M17,9H7V7h10V9z" /> - </g> - </svg> - <a href="../medium/medium.html">Medium</a> + <div class="checklist" id="searx-normal-checklist"> </div> - </section> - - <section class="option-block"> + <hr> <div class="some-block option-block"> - <h4>Enable</h4> - <input id="disable-search" type="checkbox" checked /> + <h4>Custom Instances</h4> </div> + <form id="custom-searx-normal-instance-form"> + <div class="some-block option-block"> + <input id="searx-normal-custom-instance" placeholder="https://searx.com" type="url" /> + <button type="submit" class="add" id="searx-normal-add-instance"> + <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" + fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> + </svg> + </button> + </div> + </form> + <div class="checklist" id="searx-normal-custom-checklist"></div> + </div> + <div id="searx-tor"> <div class="some-block option-block"> - <h4>Frontend</h4> - <select id="search-frontend"> - <option value="searx">SearX</option> - <option value="whoogle">Whoogle</option> - </select> + <h4>Default Instances</h4> + </div> + <div class="checklist" id="searx-tor-checklist"> </div> <hr> + <div class="some-block option-block"> + <h4>Custom Instances</h4> + </div> + <form id="custom-searx-tor-instance-form"> + <div class="some-block option-block"> + <input id="searx-tor-custom-instance" placeholder="https://searx.com" type="url" /> + <button type="submit" class="add" id="searx-tor-add-instance"> + <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" + fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> + </svg> + </button> + </div> + </form> + <div class="checklist" id="searx-tor-custom-checklist"></div> + </div> + </div> - <div id="searx"> - <div class="some-block option-block"> - <h4>Default Instances</h4> - </div> - <div class="checklist" id="searx-checklist"> - </div> - <hr> - <div class="some-block option-block"> - <h4>Custom Instances</h4> - </div> - <form id="custom-searx-instance-form"> - <div class="some-block option-block"> - <input id="searx-custom-instance" placeholder="https://searx.com" type="url" /> - <button type="submit" class="add" id="searx-add-instance"> - <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" - fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> - <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> - </svg> - </button> - </div> - </form> - <div class="checklist" id="searx-custom-checklist"></div> + <div id="whoogle"> + + <div id="whoogle-normal"> + <div class="some-block option-block"> + <h4>Default Instances</h4> + </div> + <div class="checklist" id="whoogle-normal-checklist"> + </div> + <hr> + <div class="some-block option-block"> + <h4>Custom Instances</h4> </div> + <form id="custom-whoogle-normal-instance-form"> + <div class="some-block option-block"> + <input id="whoogle-normal-custom-instance" placeholder="https://whoogle.com" type="url" /> + <button type="submit" class="add" id="whoogle-normal-add-instance"> + <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" + fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> + </svg> + </button> + </div> + </form> + <div class="checklist" id="whoogle-normal-custom-checklist"></div> + </div> + </div> - <div id="whoogle"> - <div class="some-block option-block"> - <h4>Default Instances</h4> - </div> - <div class="checklist" id="whoogle-checklist"> - </div> - <hr> - <div class="some-block option-block"> - <h4>Custom Instances</h4> - </div> - <form id="custom-whoogle-instance-form"> - <div class="some-block option-block"> - <input id="whoogle-custom-instance" placeholder="https://whoogle.com" type="url" /> - <button type="submit" class="add" id="whoogle-add-instance"> - <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" - fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> - <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> - </svg> - </button> - </div> - </form> - <div class="checklist" id="whoogle-custom-checklist"></div> + <div id="whoogle-tor"> + <div class="some-block option-block"> + <h4>Default Instances</h4> + </div> + <div class="checklist" id="whoogle-tor-checklist"> + </div> + <hr> + <div class="some-block option-block"> + <h4>Custom Instances</h4> + </div> + <form id="custom-whoogle-tor-instance-form"> + <div class="some-block option-block"> + <input id="whoogle-tor-custom-instance" placeholder="https://whoogle.com" type="url" /> + <button type="submit" class="add" id="whoogle-tor-add-instance"> + <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> + </svg> + </button> </div> - </section> + </form> + <div class="checklist" id="whoogle-tor-custom-checklist"></div> + </div> + </div> + + </section> - <script type="module" src="../init.js"></script> - <script type="module" src="../init.js"></script> - <script type="module" src="./search.js"></script> - <!-- <script src="../../assets/javascripts/localise.js"></script> --> + <script type="module" src="../init.js"></script> + <script type="module" src="./search.js"></script> + <!-- <script src="../../assets/javascripts/localise.js"></script> --> </body> -</html> +</html>
\ 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 @@ <div class="some-block option-block"> <h4>Default Instances</h4> </div> - <div class="checklist" id="proxiTok-checklist"></div> + <div class="checklist" id="proxiTok-normal-checklist"></div> <hr> <div class="some-block option-block"> <h4>Custom Instances</h4> </div> - <form id="custom-proxiTok-instance-form"> + <form id="custom-proxiTok-normal-instance-form"> <div class="some-block option-block"> - <input id="proxiTok-custom-instance" placeholder="https://proxiTok.com" type="url" /> - <button type="submit" class="add" id="proxiTok-add-instance"> + <input id="proxiTok-normal-custom-instance" placeholder="https://proxiTok.com" type="url" /> + <button type="submit" class="add" id="proxiTok-normal-add-instance"> <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -135,7 +135,7 @@ </button> </div> </form> - <div class="checklist" id="proxiTok-custom-checklist"></div> + <div class="checklist" id="proxiTok-normal-custom-checklist"></div> </section> 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 @@ <div class="some-block option-block"> <h4>Default Instances</h4> </div> - <div class="checklist" id="simplyTranslate-checklist"> + <div class="checklist" id="simplyTranslate-normal-checklist"> </div> <hr> <div class="some-block option-block"> <h4>Custom Instances</h4> </div> - <form id="custom-simplyTranslate-instance-form"> + <form id="custom-simplyTranslate-normal-instance-form"> <div class="some-block option-block"> - <input id="simplyTranslate-custom-instance" placeholder="https://simplyTranslate.com" type="url" /> - <button type="submit" class="add" id="simplyTranslate-add-instance"> + <input id="simplyTranslate-normal-custom-instance" placeholder="https://simplyTranslate.com" + type="url" /> + <button type="submit" class="add" id="simplyTranslate-normal-add-instance"> <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -375,23 +376,23 @@ </button> </div> </form> - <div class="checklist" id="simplyTranslate-custom-checklist"></div> + <div class="checklist" id="simplyTranslate-normal-custom-checklist"></div> </div> <div id="lingva"> <div class="some-block option-block"> <h4>Default Instances</h4> </div> - <div class="checklist" id="lingva-checklist"> + <div class="checklist" id="lingva-normal-checklist"> </div> <hr> <div class="some-block option-block"> <h4>Custom Instances</h4> </div> - <form id="custom-lingva-instance-form"> + <form id="custom-lingva-normal-instance-form"> <div class="some-block option-block"> - <input id="lingva-custom-instance" placeholder="https://lingva.com" type="url" /> - <button type="submit" class="add" id="lingva-add-instance"> + <input id="lingva-normal-custom-instance" placeholder="https://lingva.com" type="url" /> + <button type="submit" class="add" id="lingva-normal-add-instance"> <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -400,7 +401,7 @@ </button> </div> </form> - <div class="checklist" id="lingva-custom-checklist"></div> + <div class="checklist" id="lingva-normal-custom-checklist"></div> </div> </section> @@ -410,4 +411,4 @@ <!-- <script src="../../assets/javascripts/localise.js"></script> --> </body> -</html> +</html>
\ 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 @@ <div class="some-block option-block"> <h4>Default Instances</h4> </div> - <div class="checklist" id="wikiless-checklist"> + <div class="checklist" id="wikiless-normal-checklist"> </div> <hr> <div class="some-block option-block"> <h4>Custom Instances</h4> </div> - <form id="custom-wikiless-instance-form"> + <form id="custom-wikiless-normal-instance-form"> <div class="some-block option-block"> - <input id="wikiless-custom-instance" placeholder="https://wikiless.com" type="url" /> - <button type="submit" class="add" id="wikiless-add-instance"> + <input id="wikiless-normal-custom-instance" placeholder="https://wikiless.com" type="url" /> + <button type="submit" class="add" id="wikiless-normal-add-instance"> <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> <path d="M0 0h24v24H0V0z" fill="none" /> @@ -135,7 +135,7 @@ </button> </div> </form> - <div class="checklist" id="wikiless-custom-checklist"></div> + <div class="checklist" id="wikiless-normal-custom-checklist"></div> </section> 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 |