Made setRedirect functions async

5 files changed, 31 insertions, 30 deletions

diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js
index d6824251..61b422f4 100644
--- a/src/pages/options/widgets/general.js
+++ b/src/pages/options/widgets/general.js
@@ -36,15 +36,16 @@ updateInstancesElement.addEventListener("click", async () => {
 let exportSettingsElement = document.getElementById("export-settings")
 
 function exportSettings() {
-	browser.storage.local.get(null, result => {
+	return browser.storage.local.get(null, result => {
 		let resultString = JSON.stringify(result, null, "  ")
 		exportSettingsElement.href = "data:application/json;base64," + btoa(encodeURI(resultString))
 		exportSettingsElement.download = "libredirect-settings.json"
+		return
 	})
 }
 exportSettings()
 
-document.getElementById("general_page").addEventListener("click", exportSettings)
+document.getElementById("general_page").onclick = exportSettings
 
 let importSettingsElement = document.getElementById("import-settings")
 let importSettingsElementText = document.getElementById("import_settings_text")
@@ -82,28 +83,28 @@ resetSettings.addEventListener("click", async () => {
 			.then(async data => {
 				browser.storage.local.set({ cloudflareBlackList: JSON.parse(data).cloudflare }, () => {
 					browser.storage.local.set({ offlineBlackList: JSON.parse(data).offline }, () => {
-					browser.storage.local.set({ authenticateBlackList: JSON.parse(data).authenticate }, async () => {
-						await generalHelper.initDefaults()
-						await youtubeHelper.initDefaults()
-						await youtubeMusicHelper.initDefaults()
-						await twitterHelper.initDefaults()
-						await instagramHelper.initDefaults()
-						await mapsHelper.initDefaults()
-						await searchHelper.initDefaults()
-						await translateHelper.initDefaults()
-						await mediumHelper.initDefaults()
-						await quoraHelper.initDefaults()
-						await libremdbHelper.initDefaults()
-						await reutersHelper.initDefaults()
-						await redditHelper.initDefaults()
-						await wikipediaHelper.initDefaults()
-						await imgurHelper.initDefaults()
-						await tiktokHelper.initDefaults()
-						await sendTargetsHelper.initDefaults()
-						await peertubeHelper.initDefaults()
-						await lbryHelper.initDefaults()
-						location.reload()
-					})
+						browser.storage.local.set({ authenticateBlackList: JSON.parse(data).authenticate }, async () => {
+							await generalHelper.initDefaults()
+							await youtubeHelper.initDefaults()
+							await youtubeMusicHelper.initDefaults()
+							await twitterHelper.initDefaults()
+							await instagramHelper.initDefaults()
+							await mapsHelper.initDefaults()
+							await searchHelper.initDefaults()
+							await translateHelper.initDefaults()
+							await mediumHelper.initDefaults()
+							await quoraHelper.initDefaults()
+							await libremdbHelper.initDefaults()
+							await reutersHelper.initDefaults()
+							await redditHelper.initDefaults()
+							await wikipediaHelper.initDefaults()
+							await imgurHelper.initDefaults()
+							await tiktokHelper.initDefaults()
+							await sendTargetsHelper.initDefaults()
+							await peertubeHelper.initDefaults()
+							await lbryHelper.initDefaults()
+							location.reload()
+						})
 					})
 				})
 			})
diff --git a/src/pages/options/widgets/general.pug b/src/pages/options/widgets/general.pug
index e523d5bb..891217ca 100644
--- a/src/pages/options/widgets/general.pug
+++ b/src/pages/options/widgets/general.pug
@@ -172,19 +172,19 @@ section#general_page.option-block
         div 
             div 
                 img(src="../../../assets/images/quora.png")
-                x(data-localise="__MSG_quora__") Quora
+                x() Quora
             input#quora(type="checkbox")
 
         div 
             div 
                 img(src="../../../assets/images/imdb.svg")
-                x(data-localise="__MSG_imdb__") IMDb
+                x IMDb
             input#imdb(type="checkbox")
 
         div 
             div 
                 img(src="../../../assets/images/reuters.svg")
-                x(data-localise="__MSG_reuters__") Reuters
+                x Reuters
             input#reuters(type="checkbox")
 
         div 
diff --git a/src/pages/options/widgets/imdb.pug b/src/pages/options/widgets/imdb.pug
index 008e1c00..257d2c1a 100644
--- a/src/pages/options/widgets/imdb.pug
+++ b/src/pages/options/widgets/imdb.pug
@@ -1,6 +1,6 @@
 section#imdb_page.option-block
     .some-block.option-block
-        h1(data-localise="__MSG_imdb__") IMDb
+        h1() IMDb
     hr
     .some-block.option-block
         h4(data-localise="__MSG_enable__") Enable
diff --git a/src/pages/options/widgets/quora.pug b/src/pages/options/widgets/quora.pug
index 9e45abc9..addfe280 100644
--- a/src/pages/options/widgets/quora.pug
+++ b/src/pages/options/widgets/quora.pug
@@ -1,6 +1,6 @@
 section#quora_page.option-block
     .some-block.option-block
-        h1(data-localise="__MSG_quora__") Quora
+        h1() Quora
     hr
     .some-block.option-block
         h4(data-localise="__MSG_enable__") Enable
diff --git a/src/pages/options/widgets/reuters.pug b/src/pages/options/widgets/reuters.pug
index 08a37d50..9ed6b3b9 100644
--- a/src/pages/options/widgets/reuters.pug
+++ b/src/pages/options/widgets/reuters.pug
@@ -1,6 +1,6 @@
 section#reuters_page.option-block
     .some-block.option-block
-        h1(data-localise="__MSG_reuters__") Reuters
+        h1() Reuters
     hr
     .some-block.option-block
         h4(data-localise="__MSG_enable__") Enable