Merge pull request #17 from Joenahm1937/globalsRaceFix
Ensure globals.js is loaded prior to execution of dependent scripts
This commit is contained in:
36
globals.js
36
globals.js
@@ -1,16 +1,26 @@
|
|||||||
console.log('globals.js loaded');
|
if (typeof window.globalsLoaded === 'undefined') {
|
||||||
|
console.log('globals.js loaded');
|
||||||
|
|
||||||
let lastChecked = null;
|
window.globalsLoaded = true;
|
||||||
|
|
||||||
let Selectors = {
|
let lastChecked = null;
|
||||||
// Plus 用户的选择器
|
|
||||||
conversationsCheckbox: '.conversation-checkbox:checked',
|
|
||||||
deleteButton: '[class*="text-red"]',
|
|
||||||
confirmDeleteButton: 'button.btn.btn-danger',
|
|
||||||
threeDotButton: '[id^="radix-"]',
|
|
||||||
// 其他 Plus 用户选择器...
|
|
||||||
CONVERSATION_SELECTOR: 'div > div > div > div > div > div > nav > div > div > div > div > ol > li > div > a',
|
|
||||||
TITLE_SELECTOR: '.relative.grow.overflow-hidden.whitespace-nowrap',
|
|
||||||
};
|
|
||||||
|
|
||||||
let CHECKBOX_CLASS = 'conversation-checkbox';
|
let Selectors = {
|
||||||
|
// Plus 用户的选择器
|
||||||
|
conversationsCheckbox: '.conversation-checkbox:checked',
|
||||||
|
deleteButton: '[class*="text-red"]',
|
||||||
|
confirmDeleteButton: 'button.btn.btn-danger',
|
||||||
|
threeDotButton: '[id^="radix-"]',
|
||||||
|
// 其他 Plus 用户选择器...
|
||||||
|
CONVERSATION_SELECTOR: 'div > div > div > div > div > div > nav > div > div > div > div > ol > li > div > a',
|
||||||
|
TITLE_SELECTOR: '.relative.grow.overflow-hidden.whitespace-nowrap',
|
||||||
|
};
|
||||||
|
|
||||||
|
let CHECKBOX_CLASS = 'conversation-checkbox';
|
||||||
|
|
||||||
|
window.lastChecked = lastChecked;
|
||||||
|
window.Selectors = Selectors;
|
||||||
|
window.CHECKBOX_CLASS = CHECKBOX_CLASS;
|
||||||
|
} else {
|
||||||
|
console.log('globals.js already loaded, skipping re-initialization');
|
||||||
|
}
|
||||||
62
popup.js
62
popup.js
@@ -1,43 +1,37 @@
|
|||||||
document.getElementById('add-checkboxes').addEventListener('click', () => {
|
function loadGlobalsThenExecute(tabId, secondaryScript) {
|
||||||
chrome.tabs.query({ active: true, currentWindow: true }, ([tab]) => {
|
chrome.scripting.executeScript({
|
||||||
|
target: { tabId: tabId },
|
||||||
|
files: ['globals.js']
|
||||||
|
}, () => {
|
||||||
chrome.scripting.executeScript({
|
chrome.scripting.executeScript({
|
||||||
target: { tabId: tab.id },
|
target: { tabId: tabId },
|
||||||
files: ['addCheckboxes.js']
|
files: [secondaryScript]
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
}
|
||||||
|
|
||||||
document.getElementById('bulk-delete').addEventListener('click', () => {
|
function addButtonListener(buttonId, scriptName) {
|
||||||
chrome.tabs.query({ active: true, currentWindow: true }, ([tab]) => {
|
document.getElementById(buttonId).addEventListener('click', () => {
|
||||||
chrome.scripting.executeScript({
|
chrome.tabs.query({ active: true, currentWindow: true }, ([tab]) => {
|
||||||
target: { tabId: tab.id },
|
if (tab) {
|
||||||
files: ['bulkDeleteConversations.js']
|
loadGlobalsThenExecute(tab.id, scriptName);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
}
|
||||||
|
|
||||||
document.getElementById('toggle-checkboxes').addEventListener('click', () => {
|
function initializeButtons() {
|
||||||
chrome.tabs.query({ active: true, currentWindow: true }, ([tab]) => {
|
addButtonListener('add-checkboxes', 'addCheckboxes.js');
|
||||||
chrome.scripting.executeScript({
|
addButtonListener('bulk-delete', 'bulkDeleteConversations.js');
|
||||||
target: { tabId: tab.id },
|
addButtonListener('toggle-checkboxes', 'toggleCheckboxes.js');
|
||||||
files: ['toggleCheckboxes.js']
|
addButtonListener('remove-checkboxes', 'removeCheckboxes.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 =
|
|
||||||
'© ' + currentYear + ' <a href="https://github.com/qcrao/bulk-delete-chatGPT" target="_blank">qcrao@GitHub</a>';
|
|
||||||
|
|
||||||
|
function updateCopyrightYear() {
|
||||||
|
const currentYear = new Date().getFullYear();
|
||||||
|
document.getElementById('copyright').innerHTML =
|
||||||
|
`© ${currentYear} <a href="https://github.com/qcrao/bulk-delete-chatGPT" target="_blank">qcrao@GitHub</a>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
initializeButtons();
|
||||||
|
updateCopyrightYear();
|
||||||
|
|||||||
Reference in New Issue
Block a user