diff options
author | ManeraKai <manerakai@protonmail.com> | 2022-05-28 11:00:48 +0300 |
---|---|---|
committer | ManeraKai <manerakai@protonmail.com> | 2022-05-28 11:00:48 +0300 |
commit | 456b65af823b0a62dafe4ccb1b628e56be9cd51e (patch) | |
tree | 56deea43dbb3bf2d636624351832c89fb8440216 /src/assets | |
parent | Merge branch 'master' of https://github.com/libredirect/libredirect (diff) | |
download | libredirect-456b65af823b0a62dafe4ccb1b628e56be9cd51e.zip |
Fixed Unify Settings not working for localStorage. Fixed other things
Diffstat (limited to 'src/assets')
-rw-r--r-- | src/assets/javascripts/helpers/utils.js | 8 | ||||
-rw-r--r-- | src/assets/javascripts/helpers/youtube/youtube.js | 12 |
2 files changed, 6 insertions, 14 deletions
diff --git a/src/assets/javascripts/helpers/utils.js b/src/assets/javascripts/helpers/utils.js index 6d1956f6..8ca49438 100644 --- a/src/assets/javascripts/helpers/utils.js +++ b/src/assets/javascripts/helpers/utils.js @@ -338,7 +338,7 @@ function copyRaw(test, copyRawElement) { }) } -function unify(test, unifyElement) { +function unify(test) { return new Promise(resolve => { browser.tabs.query( { active: true, currentWindow: true }, @@ -369,12 +369,6 @@ function unify(test, unifyElement) { if (!result) result = await translateHelper.initLingvaLocalStorage(test, url); if (result) { - if (!test && unifyElement) { - const textElement = unifyElement.getElementsByTagName('h4')[0] - const oldHtml = textElement.innerHTML; - textElement.innerHTML = 'Unified'; - setTimeout(() => textElement.innerHTML = oldHtml, 1000); - } resolve(true); } else resolve() } diff --git a/src/assets/javascripts/helpers/youtube/youtube.js b/src/assets/javascripts/helpers/youtube/youtube.js index 5660f448..56dfa519 100644 --- a/src/assets/javascripts/helpers/youtube/youtube.js +++ b/src/assets/javascripts/helpers/youtube/youtube.js @@ -348,8 +348,7 @@ function initInvidiousCookies(test, from) { utils.copyCookie('invidious', from, to, 'PREFS'); } resolve(true); - } - ) + }) } function setInvidiousCookies() { @@ -368,7 +367,6 @@ function setInvidiousCookies() { function initPipedLocalStorage(test, url, tabId) { return new Promise(async resolve => { await init(); - console.log('initPipedLocalStorage'); if (disableYoutube || youtubeFrontend != 'piped') { resolve(); return; } const protocolHost = utils.protocolHost(url); if (![ @@ -380,7 +378,7 @@ function initPipedLocalStorage(test, url, tabId) { if (!test) { - browser.tabs.executeScript(tabId, { file: "/assets/javascripts/helpers/youtube/get_piped_preferences.js", runAt: "document_start" }); + browser.tabs.executeScript(tabId, { file: "/assets/javascripts/helpers/youtube/get_piped_preferences.js" }); let checkedInstances; if (youtubeProtocol == 'normal') checkedInstances = [...pipedNormalCustomRedirects, ...pipedNormalRedirectsChecks] @@ -390,7 +388,7 @@ function initPipedLocalStorage(test, url, tabId) { for (const to of checkedInstances) { browser.tabs.create( { url: checkedInstances[0] }, - tab => browser.tabs.executeScript(tab.id, { file: "/assets/javascripts/helpers/youtube/set_piped_preferences.js", runAt: "document_start" }) + tab => browser.tabs.executeScript(tab.id, { file: "/assets/javascripts/helpers/youtube/set_piped_preferences.js" }) ); } } @@ -411,7 +409,7 @@ function initPipedMaterialLocalStorage(test, url, tabId,) { ].includes(protocolHost)) { resolve(); return; } if (!test) { - browser.tabs.executeScript(tabId, { file: "/assets/javascripts/helpers/youtube/get_pipedMaterial_preferences.js", runAt: "document_start" }); + browser.tabs.executeScript(tabId, { file: "/assets/javascripts/helpers/youtube/get_pipedMaterial_preferences.js" }); let checkedInstances; if (youtubeProtocol == 'normal') checkedInstances = [...pipedMaterialNormalRedirectsChecks, ...pipedMaterialNormalCustomRedirects] @@ -421,7 +419,7 @@ function initPipedMaterialLocalStorage(test, url, tabId,) { for (const to of checkedInstances) browser.tabs.create( { url: to }, - tab => browser.tabs.executeScript(tab.id, { file: "/assets/javascripts/helpers/youtube/set_pipedMaterial_preferences.js", runAt: "document_start" }) + tab => browser.tabs.executeScript(tab.id, { file: "/assets/javascripts/helpers/youtube/set_pipedMaterial_preferences.js" }) ); } resolve(true); |