shanefully_done/bulk-delete-chatGPT
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move getUserInfo define to util.js

Browse Source
This commit is contained in:
qcrao
2024-07-25 14:47:47 +08:00
parent 3887788b9d
commit 88eab68058
3 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
globals.js
View File

@@ -14,21 +14,6 @@ if (typeof window.globalsLoaded === "undefined") {
const CHECKBOX_CLASS = "conversation-checkbox"; 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 // Expose variables to the global scope
window.Selectors = Selectors; window.Selectors = Selectors;
window.shiftPressed = false; window.shiftPressed = false;

14
popup.js
View File

@@ -2,7 +2,7 @@ function loadGlobalsThenExecute(tabId, secondaryScript, callback) {
chrome.scripting.executeScript( chrome.scripting.executeScript(
{ {
target: { tabId: tabId }, target: { tabId: tabId },
files: ["globals.js"], files: ["globals.js", "utils.js"],
}, },
() => { () => {
chrome.scripting.executeScript( chrome.scripting.executeScript(
@@ -37,25 +37,25 @@ function addButtonListener(buttonId, scriptName) {
function updateProgressBar(progress) { function updateProgressBar(progress) {
console.log("Updating progress bar:", progress); console.log("Updating progress bar:", progress);
const bulkDeleteButton = document.getElementById("bulk-delete"); const bulkDeleteButton = document.getElementById("bulk-delete");
bulkDeleteButton.style.setProperty('--progress', `${progress}%`); bulkDeleteButton.style.setProperty("--progress", `${progress}%`);
bulkDeleteButton.setAttribute('data-progress', progress); bulkDeleteButton.setAttribute("data-progress", progress);
if (progress === 100 || progress === 0) { if (progress === 100 || progress === 0) {
bulkDeleteButton.disabled = false; bulkDeleteButton.disabled = false;
bulkDeleteButton.classList.remove("progress"); bulkDeleteButton.classList.remove("progress");
bulkDeleteButton.textContent = "Bulk Delete"; // Reset button text bulkDeleteButton.textContent = "Bulk Delete"; // Reset button text
} else { } 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); console.log("Received message:", request);
if (request.action === "updateProgress") { if (request.action === "updateProgress") {
updateProgressBar(request.progress); updateProgressBar(request.progress);
} else if (request.action === "deleteComplete") { } else if (request.action === "deleteComplete") {
updateProgressBar(0); // This will reset the button text updateProgressBar(0); // This will reset the button text
} }
}); });

14
utils.js
View File

@@ -1,14 +1,14 @@
// Define getUserInfo function
function getUserInfo() { function getUserInfo() {
return new Promise((resolve) => { return new Promise((resolve, reject) => {
chrome.identity.getProfileUserInfo({ accountStatus: "ANY" }, (userInfo) => { chrome.runtime.sendMessage({ action: "getUserInfo" }, (response) => {
if (chrome.runtime.lastError) { if (chrome.runtime.lastError) {
console.error(chrome.runtime.lastError); reject(chrome.runtime.lastError);
resolve(null); } else if (response.error) {
reject(new Error(response.error));
} else { } else {
resolve(userInfo); resolve(response.userInfo);
} }
}); });
}); });
} }
window.getUserInfo = getUserInfo;