diff --git a/globals.js b/globals.js index d67a454..6737bd1 100644 --- a/globals.js +++ b/globals.js @@ -14,21 +14,6 @@ if (typeof window.globalsLoaded === "undefined") { const CHECKBOX_CLASS = "conversation-checkbox"; - // Define getUserInfo function - function getUserInfo() { - return new Promise((resolve, reject) => { - chrome.runtime.sendMessage({ action: "getUserInfo" }, (response) => { - if (chrome.runtime.lastError) { - reject(chrome.runtime.lastError); - } else if (response.error) { - reject(new Error(response.error)); - } else { - resolve(response.userInfo); - } - }); - }); - } - // Expose variables to the global scope window.Selectors = Selectors; window.shiftPressed = false; diff --git a/popup.js b/popup.js index 0444488..707124c 100644 --- a/popup.js +++ b/popup.js @@ -2,7 +2,7 @@ function loadGlobalsThenExecute(tabId, secondaryScript, callback) { chrome.scripting.executeScript( { target: { tabId: tabId }, - files: ["globals.js"], + files: ["globals.js", "utils.js"], }, () => { chrome.scripting.executeScript( @@ -37,25 +37,25 @@ function addButtonListener(buttonId, scriptName) { function updateProgressBar(progress) { console.log("Updating progress bar:", progress); const bulkDeleteButton = document.getElementById("bulk-delete"); - bulkDeleteButton.style.setProperty('--progress', `${progress}%`); - bulkDeleteButton.setAttribute('data-progress', progress); - + bulkDeleteButton.style.setProperty("--progress", `${progress}%`); + bulkDeleteButton.setAttribute("data-progress", progress); + if (progress === 100 || progress === 0) { bulkDeleteButton.disabled = false; bulkDeleteButton.classList.remove("progress"); - bulkDeleteButton.textContent = "Bulk Delete"; // Reset button text + bulkDeleteButton.textContent = "Bulk Delete"; // Reset button text } else { - bulkDeleteButton.textContent = "Deleting..."; // Change button text during deletion + bulkDeleteButton.textContent = "Deleting..."; // Change button text during deletion } } // 在消息监听器中也添加文本重置 -chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) { +chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) { console.log("Received message:", request); if (request.action === "updateProgress") { updateProgressBar(request.progress); } else if (request.action === "deleteComplete") { - updateProgressBar(0); // This will reset the button text + updateProgressBar(0); // This will reset the button text } }); diff --git a/utils.js b/utils.js index 3f5456c..dfd3174 100644 --- a/utils.js +++ b/utils.js @@ -1,14 +1,14 @@ +// Define getUserInfo function function getUserInfo() { - return new Promise((resolve) => { - chrome.identity.getProfileUserInfo({ accountStatus: "ANY" }, (userInfo) => { + return new Promise((resolve, reject) => { + chrome.runtime.sendMessage({ action: "getUserInfo" }, (response) => { if (chrome.runtime.lastError) { - console.error(chrome.runtime.lastError); - resolve(null); + reject(chrome.runtime.lastError); + } else if (response.error) { + reject(new Error(response.error)); } else { - resolve(userInfo); + resolve(response.userInfo); } }); }); } - -window.getUserInfo = getUserInfo;