Implemented changeInstance shortcut in a different way #112

3 files changed, 21 insertions, 28 deletions

diff --git a/src/manifest.json b/src/manifest.json
index 6d36be6c..c261e221 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -45,5 +45,13 @@
       "encoding": "UTF-8",
       "is_default": false
     }
+  },
+  "commands": {
+    "changeInstance": {
+      "suggested_key": {
+        "default": "Alt+Shift+L"
+      },
+      "description": "Change Instance"
+    }
   }
 }
\ No newline at end of file
diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index 6b76177a..779d0e95 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -167,14 +167,6 @@ browser.tabs.onUpdated.addListener(
     if (instagramHelper.isBibliogram(url)) instagramHelper.initBibliogramCookies(url);
     // if (changeInfo.url && youtubeHelper.isPipedorInvidious(url, 'main_frame', 'pipedMaterial')) youtubeHelper.initPipedMaterialLocalStorage(tabId);
 
-    if (changeWholeInstance(url))
-      browser.tabs.executeScript(
-        tabId,
-        {
-          file: "/pages/background/shortcuts.js",
-          runAt: "document_start"
-        }
-      );
   });
 
 function changeWholeInstance(url) {
@@ -203,12 +195,18 @@ function changeWholeInstance(url) {
   return newUrl;
 }
 
-browser.runtime.onMessage.addListener(
-  message => {
-    if (message.function === 'changeInstance') {
-      const url = new URL(message.url);
-      let newUrl = changeWholeInstance(url);
-      if (newUrl) browser.tabs.update({ url: newUrl });
-    }
+browser.commands.onCommand.addListener(
+  command => {
+    if (command === 'changeInstance')
+      chrome.tabs.query(
+        { active: true, currentWindow: true },
+        tabs => {
+          let url;
+          try { url = new URL(tabs[0].url); }
+          catch (_) { return }
+          let newUrl = changeWholeInstance(url);
+          if (newUrl) browser.tabs.update({ url: newUrl });
+        }
+      );
   }
 )
\ No newline at end of file
diff --git a/src/pages/background/shortcuts.js b/src/pages/background/shortcuts.js
deleted file mode 100644
index 12885479..00000000
--- a/src/pages/background/shortcuts.js
+++ /dev/null
@@ -1,13 +0,0 @@
-"use strict";
-
-window.browser = window.browser || window.chrome;
-
-document.addEventListener('keydown',
-    e => {
-        if (e.code === 'KeyL' && e.shiftKey && e.altKey)
-            browser.runtime.sendMessage({
-                function: "changeInstance",
-                url: window.location.href,
-            });
-    }
-)
\ No newline at end of file