Fixing bugs. Preparing for release

2 files changed, 60 insertions, 38 deletions

diff --git a/src/pages/options/index.js b/src/pages/options/index.js
index 39f9c8f3..b6fcf6b8 100644
--- a/src/pages/options/index.js
+++ b/src/pages/options/index.js
@@ -1,3 +1,12 @@
+import youtubeHelper from "../../assets/javascripts/youtube/youtube.js";
+import twitterHelper from "../../assets/javascripts/twitter.js";
+import redditHelper from "../../assets/javascripts/reddit.js";
+import searchHelper from "../../assets/javascripts/search.js";
+import translateHelper from "../../assets/javascripts/translate/translate.js";
+import wikipediaHelper from "../../assets/javascripts/wikipedia.js";
+import tiktokHelper from "../../assets/javascripts/tiktok.js";
+
+
 for (const a of document.getElementById('links').getElementsByTagName('a')) {
     a.addEventListener('click', e => {
         const path = a.getAttribute('href').replace('#', '');
diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js
index f2ed341a..f46c4011 100644
--- a/src/pages/options/widgets/general.js
+++ b/src/pages/options/widgets/general.js
@@ -63,30 +63,36 @@ importSettingsElement.addEventListener("change",
       if (
         "theme" in data &&
         "disableImgur" in data &&
-        "cloudflareBlackList" in data &&
         "imgurRedirects" in data
       ) {
-        await browser.storage.local.clear();
-        await browser.storage.local.set({ ...data })
-        await youtubeHelper.pasteInvidiousCookies();
-        await youtubeHelper.pastePipedLocalStorage();
-        await youtubeHelper.pastePipedMaterialLocalStorage();
+        browser.storage.local.clear(
+          () => {
+            browser.storage.local.set({ ...data },
+              async () => {
+                await youtubeHelper.pasteInvidiousCookies();
+                await youtubeHelper.pastePipedLocalStorage();
+                await youtubeHelper.pastePipedMaterialLocalStorage();
+
+                await translateHelper.pasteSimplyTranslateCookies();
+                await translateHelper.pasteLingvaLocalStorage();
+
+                await twitterHelper.pasteNitterCookies();
 
-        await translateHelper.pasteSimplyTranslateCookies();
-        await translateHelper.pasteLingvaLocalStorage();
+                await wikipediaHelper.pasteWikilessCookies();
 
-        await twitterHelper.pasteNitterCookies();
+                await searchHelper.pasteSearxCookies();
+                await searchHelper.pasteSearxngCookies();
 
-        await wikipediaHelper.pasteWikilessCookies();
+                await redditHelper.pasteLibredditCookies();
+                await redditHelper.pasteTedditCookies();
 
-        await searchHelper.pasteSearxCookies();
-        await searchHelper.pasteSearxngCookies();
+                await tiktokHelper.pasteProxiTokCookies();
+                
+                location.reload();
+              })
 
-        await redditHelper.pasteLibredditCookies();
-        await redditHelper.pasteTedditCookies();
+          });
 
-        await tiktokHelper.pasteProxiTokCookies();
-        location.reload();
       } else
         importError()
     }
@@ -103,28 +109,35 @@ const resetSettings = document.getElementById("reset-settings");
 resetSettings.addEventListener("click",
   async () => {
     resetSettings.innerHTML = '...'
-    await browser.storage.local.clear();
-    fetch('/instances/blacklist.json').then(response => response.text()).then(async data => {
-      await browser.storage.local.set({ cloudflareBlackList: JSON.parse(data).cloudflare })
-      await browser.storage.local.set({ authenticateBlackList: JSON.parse(data).authenticate })
-      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 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.clear(
+      () => {
+        fetch('/instances/blacklist.json').then(response => response.text()).then(async data => {
+          browser.storage.local.set({ cloudflareBlackList: JSON.parse(data).cloudflare },
+            () => {
+              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 redditHelper.initDefaults();
+                  await wikipediaHelper.initDefaults();
+                  await imgurHelper.initDefaults();
+                  await tiktokHelper.initDefaults();
+                  await sendTargetsHelper.initDefaults();
+                  await peertubeHelper.initDefaults();
+                  await lbryHelper.initDefaults();
+                  location.reload();
+                })
+            })
+        })
+      });
+
   }
 );