diff options
Diffstat (limited to 'src/pages/options/tiktok')
| -rw-r--r-- | src/pages/options/tiktok/tiktok.html | 1 | ||||
| -rw-r--r-- | src/pages/options/tiktok/tiktok.js | 104 |
2 files changed, 35 insertions, 70 deletions
diff --git a/src/pages/options/tiktok/tiktok.html b/src/pages/options/tiktok/tiktok.html index 9aff1e47..e422eef7 100644 --- a/src/pages/options/tiktok/tiktok.html +++ b/src/pages/options/tiktok/tiktok.html @@ -23,7 +23,6 @@ <div class="title"> <img src="../../../assets/images/tiktok-icon.png"><a class="selected" href="../tiktok/tiktok.html" data-localise="__MSG_tiktok__">TikTok</a></div> <div class="title"> <img src="../../../assets/images/reddit-icon.png"><a href="../reddit/reddit.html" data-localise="__MSG_reddit__">Reddit</a></div> <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/pixiv-icon.svg"><a href="../pixiv/pixiv.html" data-localise="__MSG_pixiv__">Pixiv</a></div> <div class="title"> <img src="../../../assets/images/librespeed-icon.svg"><a href="../speedtest/speedtest.html" data-localise="__MSG_speedtest__">Speedtest</a></div> <div class="title"> <img src="../../../assets/images/spotify-icon.png"><a href="../spotify/spotify.html" data-localise="__MSG_spotify__">Spotify</a></div> <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg"><a href="../wikipedia/wikipedia.html" data-localise="__MSG_wikipedia__">Wikipedia</a></div> diff --git a/src/pages/options/tiktok/tiktok.js b/src/pages/options/tiktok/tiktok.js index 299664db..61841145 100644 --- a/src/pages/options/tiktok/tiktok.js +++ b/src/pages/options/tiktok/tiktok.js @@ -26,68 +26,44 @@ document.addEventListener("change", async () => { window.onblur = tiktokHelper.initProxiTokCookies; -function init() { - tiktokHelper.init().then(() => { - browser.storage.local.get( - [ - "disableTiktok", - "tiktokProtocol", +browser.storage.local.get( + [ + "disableTiktok", + "tiktokProtocol", - "enableTiktokCustomSettings", + "enableTiktokCustomSettings", - "proxiTokTheme", - "proxiTokApiLegacy", - ], - r => { - disable.checked = !r.disableTiktok; - protocol.value = r.tiktokProtocol; - let normalDiv = document.getElementsByClassName("normal")[0]; - let torDiv = document.getElementsByClassName("tor")[0]; - if (r.tiktokProtocol == 'normal') { - normalDiv.style.display = 'block'; - torDiv.style.display = 'none'; - } - else if (r.tiktokProtocol == 'tor') { - normalDiv.style.display = 'none'; - torDiv.style.display = 'block'; - } + "proxiTokTheme", + "proxiTokApiLegacy", + ], + r => { + disable.checked = !r.disableTiktok; + protocol.value = r.tiktokProtocol; + let normalDiv = document.getElementsByClassName("normal")[0]; + let torDiv = document.getElementsByClassName("tor")[0]; + if (r.tiktokProtocol == 'normal') { + normalDiv.style.display = 'block'; + torDiv.style.display = 'none'; + } + else if (r.tiktokProtocol == 'tor') { + normalDiv.style.display = 'none'; + torDiv.style.display = 'block'; + } - enableCustomSettings.checked = r.enableTiktokCustomSettings; - if (r.enableTiktokCustomSettings) - customSettingsDiv.style.display = 'block'; - else - customSettingsDiv.style.display = 'none'; + 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 + } +) + +commonHelper.processDefaultCustomInstances('proxiTok', 'normal', tiktokHelper, document); +commonHelper.processDefaultCustomInstances('proxiTok', 'tor', tiktokHelper, document) - theme.value = r.proxiTokTheme; - api_legacy.value = r.proxiTokApiLegacy - } - ) - browser.storage.local.get("proxiTokLatency").then(r => { - commonHelper.processDefaultCustomInstances( - 'proxiTok', - 'normal', - tiktokHelper, - document, - tiktokHelper.getProxiTokNormalRedirectsChecks, - tiktokHelper.setProxiTokNormalRedirectsChecks, - tiktokHelper.getProxiTokNormalCustomRedirects, - tiktokHelper.setProxiTokNormalCustomRedirects, - r.proxiTokLatency, - ); - }) - commonHelper.processDefaultCustomInstances( - 'proxiTok', - 'tor', - tiktokHelper, - document, - tiktokHelper.getProxiTokTorRedirectsChecks, - tiktokHelper.setProxiTokTorRedirectsChecks, - tiktokHelper.getProxiTokTorCustomRedirects, - tiktokHelper.setProxiTokTorCustomRedirects - ) - }) -} -init(); let latencyElement = document.getElementById("latency"); let latencyLabel = document.getElementById("latency-label"); @@ -102,17 +78,7 @@ latencyElement.addEventListener("click", commonHelper.testLatency(latencyLabel, redirects.proxiTok.normal).then(r => { browser.storage.local.set({ proxiTokLatency: r }); latencyLabel.innerHTML = oldHtml; - commonHelper.processDefaultCustomInstances( - 'proxiTok', - 'normal', - tiktokHelper, - document, - tiktokHelper.getProxiTokNormalRedirectsChecks, - tiktokHelper.setProxiTokNormalRedirectsChecks, - tiktokHelper.getProxiTokNormalCustomRedirects, - tiktokHelper.setProxiTokNormalCustomRedirects, - r, - ) + commonHelper.processDefaultCustomInstances('proxiTok', 'normal', tiktokHelper, document) latencyElement.removeEventListener("click", reloadWindow) }); } |