Changed changeInstance() structure

2 files changed, 17 insertions, 20 deletions

diff --git a/src/pages/options/youtube/youtube.html b/src/pages/options/youtube/youtube.html
index e0774c0a..add3276c 100644
--- a/src/pages/options/youtube/youtube.html
+++ b/src/pages/options/youtube/youtube.html
@@ -98,6 +98,7 @@
       <select id="youtube-frontend">
         <option value="invidious">Invidious</option>
         <option value="piped">Piped</option>
+        <option value="pipedMaterial">Piped-Material</option>
         <option value="freetube">FreeTube</option>
         <option value="yatte">Yattee</option>
       </select>
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index 9c5f28f3..3d62dcd4 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -114,33 +114,29 @@ document.getElementById("change-instance").addEventListener("click",
   () => browser.tabs.query({ active: true, currentWindow: true }, function (tabs) {
     let currTab = tabs[0];
     if (currTab) {
-      changeInstance(currTab.url)
-    }
-  })
-);
-
-function changeInstance(url) {
-  var tabUrl = new URL(url);
-  var protocolHost = `${tabUrl.protocol}//${tabUrl.host}`;
-  var newUrl;
+      let url = currTab.url;
+      let tabUrl = new URL(url);
+      let newUrl;
 
-  newUrl = youtubeHelper.changeInstance(tabUrl);
+      newUrl = youtubeHelper.changeInstance(tabUrl);
 
-  if (!newUrl) newUrl = twitterHelper.changeInstance(tabUrl);
+      if (!newUrl) newUrl = twitterHelper.changeInstance(tabUrl);
 
-  if (!newUrl) newUrl = instagramHelper.changeInstance(tabUrl);
+      if (!newUrl) newUrl = instagramHelper.changeInstance(tabUrl);
 
-  if (!newUrl) newUrl = redditHelper.changeInstance(tabUrl);
+      if (!newUrl) newUrl = redditHelper.changeInstance(tabUrl);
 
-  if (!newUrl) newUrl = searchHelper.changeInstance(tabUrl);
+      if (!newUrl) newUrl = searchHelper.changeInstance(tabUrl);
 
-  if (!newUrl) newUrl = translateHelper.changeInstance(tabUrl);
+      if (!newUrl) newUrl = translateHelper.changeInstance(tabUrl);
 
-  if (!newUrl) newUrl = mediumHelper.changeInstance(tabUrl);
+      if (!newUrl) newUrl = mediumHelper.changeInstance(tabUrl);
 
-  if (!newUrl) newUrl = imgurHelper.changeInstance(tabUrl);
+      if (!newUrl) newUrl = imgurHelper.changeInstance(tabUrl);
 
-  if (!newUrl) newUrl = wikipediaHelper.changeInstance(tabUrl)
+      if (!newUrl) newUrl = wikipediaHelper.changeInstance(tabUrl)
 
-  if (newUrl) browser.tabs.update({ url: tabUrl.href.replace(protocolHost, newUrl) });
-}
+      if (newUrl) browser.tabs.update({ url: newUrl });
+    }
+  })
+);