about summary refs log tree commit diff stats
path: root/src/pages/options/tiktok
diff options
context:
space:
mode:
authorManeraKai <manerakai@protonmail.com>2022-05-15 18:44:28 +0300
committerManeraKai <manerakai@protonmail.com>2022-05-15 18:44:28 +0300
commitab44fd04ffa1055bd17a3da02017e8de3da88af2 (patch)
tree31480d540bcedd00c74ede926449af3ed34856bb /src/pages/options/tiktok
parentMerge branch 'master' of https://github.com/libredirect/libredirect (diff)
downloadlibredirect-ab44fd04ffa1055bd17a3da02017e8de3da88af2.zip
Complete on supporting Unify #234
Diffstat (limited to 'src/pages/options/tiktok')
-rw-r--r--src/pages/options/tiktok/tiktok.html66
-rw-r--r--src/pages/options/tiktok/tiktok.js44
-rw-r--r--src/pages/options/tiktok/tiktok.pug21
3 files changed, 27 insertions, 104 deletions
diff --git a/src/pages/options/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html
index 5f969d82..9b5932fc 100644
--- a/src/pages/options/tiktok/tiktok.html
+++ b/src/pages/options/tiktok/tiktok.html
@@ -12,9 +12,9 @@
 <body class="option" dir="auto">
     <section class="links">
       <div class="title">
-        <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor">
-          <path d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z"></path>
-        </svg><a href="../general/general.html" data-localise="__MSG_general__">General</a>
+          <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor">
+            <path d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z"></path>
+          </svg><a href="../general/general.html" data-localise="__MSG_general__">General</a>
       </div>
       <div class="title"> <img src="../../../assets/images/youtube-icon.png"><a href="../youtube/youtube.html" data-localise="__MSG_youtube__">YouTube </a></div>
       <div class="title"> <img src="../../../assets/images/youtube-music-icon.png"><a href="../youtubeMusic/youtubeMusic.html" data-localise="__MSG_ytmusic__">YT Music</a></div>
@@ -25,33 +25,33 @@
       <div class="title"> <img src="../../../assets/images/imgur-icon.png"><a href="../imgur/imgur.html" data-localise="__MSG_imgur__">Imgur</a></div>
       <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg"><a href="../wikipedia/wikipedia.html" data-localise="__MSG_wikipedia__">Wikipedia</a></div>
       <div class="title"> 
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor">
-          <circle cx="500" cy="500" r="500"></circle>
-          <ellipse ry="475" rx="250" cy="501" cx="1296"></ellipse>
-          <ellipse cx="1682" cy="502" rx="88" ry="424"></ellipse>
-        </svg><a href="../medium/medium.html" data-localise="__MSG_medium__">Medium</a>
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor">
+            <circle cx="500" cy="500" r="500"></circle>
+            <ellipse ry="475" rx="250" cy="501" cx="1296"></ellipse>
+            <ellipse cx="1682" cy="502" rx="88" ry="424"></ellipse>
+          </svg><a href="../medium/medium.html" data-localise="__MSG_medium__">Medium</a>
       </div>
       <div class="title"> <img src="../../../assets/images/peertube-icon.svg"><a href="../peertube/peertube.html" data-localise="__MSG_peertube__">Peertube</a></div>
       <div class="title"> <img src="../../../assets/images/lbry-icon.png"><a href="../lbry/lbry.html" data-localise="__MSG_lbry__">LBRY/Odysee</a></div>
       <div class="title"> 
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
-          <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"></path>
-        </svg><a href="../search/search.html" data-localise="__MSG_search__">Search</a>
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+            <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"></path>
+          </svg><a href="../search/search.html" data-localise="__MSG_search__">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="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"></path>
-        </svg><a href="../translate/translate.html" data-localise="__MSG_translate__">Translate</a>
+          <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+            <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"></path>
+          </svg><a href="../translate/translate.html" data-localise="__MSG_translate__">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="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z"></path>
-        </svg><a href="../maps/maps.html" data-localise="__MSG_maps__">Maps</a>
+          <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+            <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"></path>
+          </svg><a href="../maps/maps.html" data-localise="__MSG_maps__">Maps</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="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z"></path>
-        </svg><a href="../sendTargets/sendTargets.html" data-localise="__MSG_sendFiles__">Send Files</a>
+          <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+            <path d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z"></path>
+          </svg><a href="../sendTargets/sendTargets.html" data-localise="__MSG_sendFiles__">Send Files</a>
       </div>
     </section>
   <section class="option-block">
@@ -66,34 +66,8 @@
         <option value="tor" data-localise="__MSG_tor__">Tor</option>
       </select>
     </div>
-    <div class="some-block option-block">
-      <h4 data-localise="__MSG_enableCustomSettings__">Enable Custom Settings (will use cookies)</h4>
-      <input id="enable-custom-settings" type="checkbox">
-    </div>
     <div id="proxiTok">
       <hr>
-      <div class="custom-settings">
-        <div class="some-block option-block">
-          <h2>General</h2>
-        </div>
-        <div class="some-block option-block">
-          <h4 data-localise="__MSG_theme__">Theme</h4>
-          <select class="theme">
-            <option value="default">Default</option>
-            <option value="card">Card</option>
-          </select>
-        </div>
-        <div class="some-block option-block">
-          <h2>Api</h2>
-        </div>
-        <div class="some-block option-block">
-          <h4 data-localise="__MSG_legacyMode__">Legacy mode</h4>
-          <select class="api-legacy">
-            <option value="on">On</option>
-            <option value="off">Off</option>
-          </select>
-        </div>
-      </div>
       <div class="normal">
                 <div class="some-block option-block">
                   <h4 data-localise="__MSG_defaultInstances__">Default Instances</h4>
diff --git a/src/pages/options/tiktok/tiktok.js b/src/pages/options/tiktok/tiktok.js
index 56cf93dc..8055fc95 100644
--- a/src/pages/options/tiktok/tiktok.js
+++ b/src/pages/options/tiktok/tiktok.js
@@ -4,24 +4,12 @@ import commonHelper from "../../../assets/javascripts/helpers/common.js";
 let disable = document.getElementById("disable-tiktok");
 let protocol = document.getElementById("protocol")
 
-let enableCustomSettings = document.getElementById("enable-custom-settings");
-let customSettingsDiv = document.getElementsByClassName("custom-settings");
-
-let theme = document.getElementById('proxiTok').getElementsByClassName('theme')[0];
-let api_legacy = document.getElementById('proxiTok').getElementsByClassName('api-legacy')[0];
-
-document.addEventListener("change", async () => {
-    await browser.storage.local.set({
+document.addEventListener("change", () => {
+    browser.storage.local.set({
         disableTiktok: !disable.checked,
         tiktokProtocol: protocol.value,
-
-        enableTiktokCustomSettings: enableCustomSettings.checked,
-
-        proxiTokTheme: theme.value,
-        proxiTokApiLegacy: api_legacy.value,
-
     });
-    changeProtocolSettings(protocol.value);
+    changeProtocolSettings();
 })
 
 window.onblur = tiktokHelper.initProxiTokCookies;
@@ -30,16 +18,11 @@ browser.storage.local.get(
     [
         "disableTiktok",
         "tiktokProtocol",
-
-        "enableTiktokCustomSettings",
-
-        "proxiTokTheme",
-        "proxiTokApiLegacy",
     ],
     r => {
         disable.checked = !r.disableTiktok;
         protocol.value = r.tiktokProtocol;
-        changeProtocolSettings(r.tiktokProtocol);
+        changeProtocolSettings();
         let normalDiv = document.getElementsByClassName("normal")[0];
         let torDiv = document.getElementsByClassName("tor")[0];
         if (r.tiktokProtocol == 'normal') {
@@ -50,33 +33,20 @@ browser.storage.local.get(
             normalDiv.style.display = 'none';
             torDiv.style.display = 'block';
         }
-
-        enableCustomSettings.checked = r.enableTiktokCustomSettings;
-        if (r.enableTiktokCustomSettings)
-            customSettingsDiv.style.display = 'block';
-        else
-            customSettingsDiv.style.display = 'none';
-
-        theme.value = r.proxiTokTheme;
-        api_legacy.value = r.proxiTokApiLegacy;
     }
 )
 
-function changeProtocolSettings(protocol) {
+function changeProtocolSettings() {
     let normalDiv = document.getElementsByClassName("normal")[0];
     let torDiv = document.getElementsByClassName("tor")[0];
-    if (protocol == 'normal') {
+    if (protocol.value == 'normal') {
         normalDiv.style.display = 'block';
         torDiv.style.display = 'none';
     }
-    else if (protocol == 'tor') {
+    else if (protocol.value == 'tor') {
         normalDiv.style.display = 'none';
         torDiv.style.display = 'block';
     }
-    if (enableCustomSettings.checked)
-        for (const item of customSettingsDiv) item.style.display = 'block';
-    else
-        for (const item of customSettingsDiv) item.style.display = 'none';
 }
 
 commonHelper.processDefaultCustomInstances('tiktok', 'proxiTok', 'normal', document);
diff --git a/src/pages/options/tiktok/tiktok.pug b/src/pages/options/tiktok/tiktok.pug
index 31ae18df..528f6ae2 100644
--- a/src/pages/options/tiktok/tiktok.pug
+++ b/src/pages/options/tiktok/tiktok.pug
@@ -17,30 +17,9 @@ body.option(dir="auto")
             select#protocol
                 option(value="normal" data-localise="__MSG_normal__") Normal
                 option(value="tor" data-localise="__MSG_tor__") Tor
-
-        .some-block.option-block
-                h4(data-localise="__MSG_enableCustomSettings__") Enable Custom Settings (will use cookies)
-                input#enable-custom-settings(type="checkbox")
         
         #proxiTok
             hr
-            .custom-settings
-                .some-block.option-block
-                    h2 General
-                .some-block.option-block
-                    h4(data-localise="__MSG_theme__") Theme
-                    select.theme
-                        option(value="default") Default
-                        option(value="card") Card
-
-                .some-block.option-block
-                    h2 Api
-                .some-block.option-block
-                    h4(data-localise="__MSG_legacyMode__") Legacy mode
-                    select.api-legacy
-                        option(value="on") On
-                        option(value="off") Off
-
             .normal
                 include ../../widgets/instances.pug
                 +instances('https://proxitok.com')