Ensure globals.js is loaded prior to execution of dependent scripts

This commit prevents a race condition that causes global variables
defined in globals.js to be inaccessible to the other content scripts
This commit is contained in:
Joseph Nahm
2024-04-08 22:20:57 -07:00
parent f2128e045b
commit c731c5316d
2 changed files with 51 additions and 47 deletions

View File

@@ -1,43 +1,37 @@
document.getElementById('add-checkboxes').addEventListener('click', () => {
chrome.tabs.query({ active: true, currentWindow: true }, ([tab]) => {
function loadGlobalsThenExecute(tabId, secondaryScript) {
chrome.scripting.executeScript({
target: { tabId: tabId },
files: ['globals.js']
}, () => {
chrome.scripting.executeScript({
target: { tabId: tab.id },
files: ['addCheckboxes.js']
target: { tabId: tabId },
files: [secondaryScript]
});
});
});
}
document.getElementById('bulk-delete').addEventListener('click', () => {
chrome.tabs.query({ active: true, currentWindow: true }, ([tab]) => {
chrome.scripting.executeScript({
target: { tabId: tab.id },
files: ['bulkDeleteConversations.js']
function addButtonListener(buttonId, scriptName) {
document.getElementById(buttonId).addEventListener('click', () => {
chrome.tabs.query({ active: true, currentWindow: true }, ([tab]) => {
if (tab) {
loadGlobalsThenExecute(tab.id, scriptName);
}
});
});
});
}
document.getElementById('toggle-checkboxes').addEventListener('click', () => {
chrome.tabs.query({ active: true, currentWindow: true }, ([tab]) => {
chrome.scripting.executeScript({
target: { tabId: tab.id },
files: ['toggleCheckboxes.js']
});
});
});
document.getElementById('remove-checkboxes').addEventListener('click', () => {
chrome.tabs.query({ active: true, currentWindow: true }, ([tab]) => {
chrome.scripting.executeScript({
target: { tabId: tab.id },
files: ['removeCheckboxes.js']
});
});
});
// Update copyright year
const currentYear = new Date().getFullYear();
document.getElementById('copyright').innerHTML =
'&copy; ' + currentYear + ' <a href="https://github.com/qcrao/bulk-delete-chatGPT" target="_blank">qcrao@GitHub</a>';
function initializeButtons() {
addButtonListener('add-checkboxes', 'addCheckboxes.js');
addButtonListener('bulk-delete', 'bulkDeleteConversations.js');
addButtonListener('toggle-checkboxes', 'toggleCheckboxes.js');
addButtonListener('remove-checkboxes', 'removeCheckboxes.js');
}
function updateCopyrightYear() {
const currentYear = new Date().getFullYear();
document.getElementById('copyright').innerHTML =
`&copy; ${currentYear} <a href="https://github.com/qcrao/bulk-delete-chatGPT" target="_blank">qcrao@GitHub</a>`;
}
initializeButtons();
updateCopyrightYear();