ageng/ClearUrls
1
0
Fork 0
mirror of https://gitlab.com/KevinRoebert/ClearUrls synced 2025-12-18 23:25:36 +07:00
Code Issues Projects Releases Wiki Activity

Fix updating whitelist button

Browse Source 
- Button now reflects whitelist status instantly
- Fixed bug where only last site whitelisted displayed properly
- No longer breaks when spammed
- Removed test code
This commit is contained in:
Banaanae
2024-06-27 09:41:57 +10:00
committed by Kevin
parent 81eb931e02
commit fcbe2abfdd
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core_js/popup.js
View File

@@ -68,7 +68,7 @@ function changeStatistics()
function setWhitelistText() function setWhitelistText()
{ {
let element = document.getElementById('whitelist_btn'); let element = document.getElementById('whitelist_btn');
let currentSite; let currentSite, siteFound;
browser.tabs.query({active: true, currentWindow: true}, function(tabs) { browser.tabs.query({active: true, currentWindow: true}, function(tabs) {
currentSite = tabs[0].url; currentSite = tabs[0].url;
}); });
@@ -78,20 +78,20 @@ function setWhitelistText()
params: ['whitelist'] params: ['whitelist']
}).then((data) => { }).then((data) => {
data.response.forEach(site => { data.response.forEach(site => {
console.log(currentSite.indexOf(site)) if (currentSite.indexOf(site) != -1) {
if (currentSite.indexOf(site) == -1) { siteFound = true
element.textContent = translate('popup_html_configs_whitelist_button_add')
document.getElementById('whitelist_btn').onclick = changeWhitelist;
element.classList.replace('btn-danger', 'btn-primary')
} else {
element.textContent = translate('popup_html_configs_whitelist_button_remove')
document.getElementById('whitelist_btn').onclick = () => {changeWhitelist(true)};
element.classList.replace('btn-primary', 'btn-danger')
} }
}); });
if (data.response.length == 0) { if (!siteFound) {
if (data.response.length != 0) {
element.classList.replace('btn-danger', 'btn-primary')
}
element.textContent = translate('popup_html_configs_whitelist_button_add') element.textContent = translate('popup_html_configs_whitelist_button_add')
document.getElementById('whitelist_btn').onclick = changeWhitelist; document.getElementById('whitelist_btn').onclick = changeWhitelist;
} else {
element.classList.replace('btn-primary', 'btn-danger')
element.textContent = translate('popup_html_configs_whitelist_button_remove')
document.getElementById('whitelist_btn').onclick = () => {changeWhitelist(true)};
} }
}).catch(handleError); }).catch(handleError);
} }
@@ -198,7 +198,6 @@ function changeWhitelist(removeWl = false) {
if (removeWl != true) { // Handle click obj if (removeWl != true) { // Handle click obj
removeWl = false removeWl = false
} }
console.log('call')
let site; let site;
browser.tabs.query({active: true, currentWindow: true}, function(tabs) { // Couldn't figure out how to access currentUrl var browser.tabs.query({active: true, currentWindow: true}, function(tabs) { // Couldn't figure out how to access currentUrl var
site = tabs[0].url; // So this is used instead site = tabs[0].url; // So this is used instead
@@ -209,7 +208,6 @@ function changeWhitelist(removeWl = false) {
}).then((data) => { }).then((data) => {
let siteUrl = new URL(site) let siteUrl = new URL(site)
let domain = siteUrl.hostname let domain = siteUrl.hostname
console.log(removeWl)
if (removeWl == false) { if (removeWl == false) {
data.response.push(domain) data.response.push(domain)
} else { } else {
@@ -218,9 +216,10 @@ function changeWhitelist(removeWl = false) {
browser.runtime.sendMessage({ browser.runtime.sendMessage({
function: "setData", function: "setData",
params: ['whitelist', data.response] params: ['whitelist', data.response]
}).catch(handleError); }).then(() => {
}).catch(handleError);
setWhitelistText(); setWhitelistText();
}).catch(handleError);
}).catch(handleError);
} }
/** /**