From 64014cfdf7933bd5991a1717d7e2f110d4222e1f Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Thu, 9 Jun 2022 20:29:05 +0300 Subject: Fixed thing in reddit. Fixed bug in incognito, Fixed localise module error. Bump => 2.1.0 --- src/assets/javascripts/reddit.js | 10 +++++----- src/pages/background/background.js | 2 +- src/pages/errors/instance_offline.html | 9 ++++----- src/pages/errors/instance_offline.js | 5 +++++ src/updates/updates.xml | 2 +- 5 files changed, 16 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/assets/javascripts/reddit.js b/src/assets/javascripts/reddit.js index 58ed813a..90e5a400 100644 --- a/src/assets/javascripts/reddit.js +++ b/src/assets/javascripts/reddit.js @@ -240,12 +240,12 @@ function redirect(url, type, initiator) { if (redditFrontend == 'teddit') { if (tedditInstancesList.length === 0) return; let tedditRandomInstance = utils.getRandomInstance(tedditInstancesList); - return `${tedditRandomInstance}/pics/w:null_${url.pathname.substring(1)}${url.reddit}`; + return `${tedditRandomInstance}/pics/w:null_${url.pathname.substring(1)}${url.search}`; } if (redditFrontend == 'libreddit') { if (libredditInstancesList.length === 0) return; let libredditRandomInstance = utils.getRandomInstance(libredditInstancesList); - return `${libredditRandomInstance}/img${url.pathname}${url.reddit}` + return `${libredditRandomInstance}/img${url.pathname}${url.search}` } } else if (url.host === "redd.it") { @@ -253,13 +253,13 @@ function redirect(url, type, initiator) { if (libredditInstancesList.length === 0) return; let libredditRandomInstance = utils.getRandomInstance(libredditInstancesList); // https://redd.it/foo => https://libredd.it/comments/foo - return `${libredditRandomInstance}/comments${url.pathname}${url.reddit}`; + return `${libredditRandomInstance}/comments${url.pathname}${url.search}`; } if (redditFrontend == 'teddit' && !url.pathname.match(/^\/+[^\/]+\/+[^\/]/)) { if (tedditInstancesList.length === 0) return; let tedditRandomInstance = utils.getRandomInstance(tedditInstancesList); // https://redd.it/foo => https://teddit.net/comments/foo - return `${tedditRandomInstance}/comments${url.pathname}${url.reddit}` + return `${tedditRandomInstance}/comments${url.pathname}${url.search}` } } else if (url.host === 'preview.redd.it') { @@ -267,7 +267,7 @@ function redirect(url, type, initiator) { if (redditFrontend == 'libreddit') { if (libredditInstancesList.length === 0) return; const libredditRandomInstance = utils.getRandomInstance(libredditInstancesList); - return `${libredditRandomInstance}/preview/pre${url.pathname}${url.reddit}`; + return `${libredditRandomInstance}/preview/pre${url.pathname}${url.search}`; } } diff --git a/src/pages/background/background.js b/src/pages/background/background.js index 0815096b..87e13ad3 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -139,7 +139,7 @@ browser.tabs.onCreated.addListener( tab => { if (tab.incognito) { incognitoList.push(tab.id); - if (incognitoList.length == 1) browser.tabs.create({ url: browser.runtime.getURL("/pages/background/incognito.html") }); + if (incognitoList.length == 1) browser.tabs.create({ url: browser.runtime.getURL("/pages/background/incognito.html"), active: false }); } } ); diff --git a/src/pages/errors/instance_offline.html b/src/pages/errors/instance_offline.html index 4c47997b..3b7e46d5 100644 --- a/src/pages/errors/instance_offline.html +++ b/src/pages/errors/instance_offline.html @@ -29,14 +29,13 @@
-

This instance is offline, you'll be redirected after 2 seconds +

This instance is offline, you'll be redirected + after 2 seconds

- - + - + \ No newline at end of file diff --git a/src/pages/errors/instance_offline.js b/src/pages/errors/instance_offline.js index ba9dd522..8137ccd0 100644 --- a/src/pages/errors/instance_offline.js +++ b/src/pages/errors/instance_offline.js @@ -1,3 +1,6 @@ +import localise from "../../assets/javascripts/localise.js"; + + const params = new Proxy( new URLSearchParams(window.location.search), { get: (searchParams, prop) => searchParams.get(prop) } @@ -18,3 +21,5 @@ document.getElementById("cancel").addEventListener("click", () => { isCanceled = true; document.getElementById("message").innerHTML = browser.i18n.getMessage('redirectionCanceled'); }) + +localise.localisePage(); \ No newline at end of file diff --git a/src/updates/updates.xml b/src/updates/updates.xml index c94edc1a..eccf9111 100644 --- a/src/updates/updates.xml +++ b/src/updates/updates.xml @@ -1,6 +1,6 @@ - + -- cgit 1.4.1