fix: context menu

Use same popout window
Sudo-Ivan · Sep 22, 2024 · 3d0aff2 · 3d0aff2
1 parent d99995f
commit 3d0aff2
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 18 deletions.
diff --git a/js/background.js b/js/background.js
@@ -1,3 +1,5 @@
+let popupWindowId = null;
+
 chrome.runtime.onInstalled.addListener(() => {
   const defaultWordlist = {
     "bypassing censorship is the best": "veggies are good for you"
@@ -24,7 +26,7 @@ chrome.contextMenus.onClicked.addListener((info, tab) => {
         action: info.menuItemId,
         message: info.selectionText
       }, (response) => {
-        openPopupWithResults(tab.id, response);
+        openOrUpdatePopupWithResults(response, info.selectionText);
       });
     });
   }
@@ -59,22 +61,45 @@ function escapeRegExp(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
 
-function openPopupWithResults(tabId, results, originalMessage) {
-  chrome.windows.create({
-    url: chrome.runtime.getURL("html/popup.html"),
-    type: "popup",
-    width: 400,
-    height: 600
-  }, (popupWindow) => {
-    chrome.tabs.onUpdated.addListener(function listener(updatedTabId, info) {
-      if (info.status === 'complete' && updatedTabId === popupWindow.tabs[0].id) {
-        chrome.tabs.onUpdated.removeListener(listener);
-        chrome.tabs.sendMessage(popupWindow.tabs[0].id, {
-          action: "showResults",
-          results: results,
-          message: originalMessage
-        });
+function openOrUpdatePopupWithResults(results, originalMessage) {
+  if (popupWindowId === null) {
+    chrome.windows.create({
+      url: chrome.runtime.getURL("html/popup.html"),
+      type: "popup",
+      width: 400,
+      height: 600
+    }, (popupWindow) => {
+      popupWindowId = popupWindow.id;
+      chrome.tabs.onUpdated.addListener(function listener(updatedTabId, info) {
+        if (info.status === 'complete' && updatedTabId === popupWindow.tabs[0].id) {
+          chrome.tabs.onUpdated.removeListener(listener);
+          sendResultsToPopup(popupWindow.tabs[0].id, results, originalMessage);
+        }
+      });
+    });
+  } else {
+    chrome.windows.get(popupWindowId, { populate: true }, (window) => {
+      if (chrome.runtime.lastError) {
+        popupWindowId = null;
+        openOrUpdatePopupWithResults(results, originalMessage);
+      } else {
+        chrome.windows.update(popupWindowId, { focused: true });
+        sendResultsToPopup(window.tabs[0].id, results, originalMessage);
       }
     });
+  }
+}
+
+function sendResultsToPopup(tabId, results, originalMessage) {
+  chrome.tabs.sendMessage(tabId, {
+    action: "showResults",
+    results: results,
+    message: originalMessage
   });
-}
+}
+
+chrome.windows.onRemoved.addListener((windowId) => {
+  if (windowId === popupWindowId) {
+    popupWindowId = null;
+  }
+});
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 3,
     "name": "Cryptic Chat",
-    "version": "1.3",
+    "version": "1.3.1",
     "author": {
       "name": "Sudo-Ivan"
     },