Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Single Click Whitelist #3

Merged
merged 1 commit into from
Oct 21, 2020
Merged

Single Click Whitelist #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions src/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

var currentTabId;
var tempDisabled = false;

var doBlock = (url, tabId) => {
Expand Down Expand Up @@ -51,7 +52,11 @@ var doBlock = (url, tabId) => {
};

var updateIcon = () => {
if (tempDisabled) {
var domain = /:\/\/([^/]+)/.exec(tabUrls[currentTabId])[1]; // this line is not original
var list = settings.get("whitelist_domains"); // this line is not original
// old: if (tempDisabled) {
// new: if (tempDisabled || list.indexOf(domain) !== -1) {
if (tempDisabled || list.indexOf(domain) !== -1) {
chrome.browserAction.setIcon({
path: {
"16": "images/blocker-temp-disabled-16.png",
Expand Down Expand Up @@ -116,11 +121,28 @@ var permDisable = () => {
};

chrome.browserAction.onClicked.addListener(tab => {
if (settings.get('enabled') && settings.get('click_action') === 'temporary') {
/*if (settings.get('enabled') && settings.get('click_action') === 'temporary') {
tempDisable(tab.id);
} else {
permDisable();
}*/
// Change left-click action from temporarily dissabling to togglign whitelist
var domain = /:\/\/([^/]+)/.exec(tab.url)[1];
var list = settings.get("whitelist_domains");
if (!list.includes(domain)) {
list = list.slice();
list.push(domain);
settings.set("whitelist_domains", list);
chrome.tabs.reload(tab.id);
}
else {
list = list.slice();
var index = list.indexOf(domain);
if (index === -1) { return; }
list.splice(index, 1);
settings.set("whitelist_domains", list);
chrome.tabs.reload(tab.id);
}
});

chrome.contextMenus.create({
Expand Down Expand Up @@ -153,14 +175,14 @@ chrome.contextMenus.create({
settings.set("whitelist_domains", list);
chrome.tabs.reload(tab.id);
}
else { // If the domain is already in the list, remove it
else {
list = list.slice();
var index = list.indexOf(domain);
if (index === -1) { return; } // this is probably redundant...
if (index === -1) { return; }
list.splice(index, 1);
settings.set("whitelist_domains", list);
chrome.tabs.reload(tab.id);
}
}
}
});

Expand All @@ -182,10 +204,12 @@ chrome.webRequest.onBeforeRequest.addListener(
var tabUrls = {};
chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
var url = changeInfo.url ? changeInfo.url : tab.url;
currentTabId = tab.id;
tabUrls[tab.id] = url;
if (url && doBlock(url)) {
chrome.tabs.insertCSS(tabId, {code: "img{visibility: hidden !important;}", runAt: "document_start"});
}
updateIcon();
});

chrome.tabs.query({}, tabs => tabs.forEach(tab => tabUrls[tab.id] = tab.url));