security-and-privacy/CanvasBlocker
security-and-privacy/CanvasBlocker
1
0
Fork 0
mirror of https://github.com/kkapsner/CanvasBlocker synced 2025-01-05 11:32:20 +01:00
Code Releases Activity

Protected notification api calls

Browse Source 
Firefox on Android does not support all of them.

Fixes #276
This commit is contained in:
kkapsner 2018-10-02 19:23:59 +02:00
parent d4d0d80721
commit 3a7c15157c
1 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
lib/notification.js
View File

@ -52,9 +52,11 @@
} }
}; };
browser.browserAction.setBadgeBackgroundColor({ if (browser.browserAction.setBadgeBackgroundColor){
color: "rgba(255, 0, 0, 0.6)" browser.browserAction.setBadgeBackgroundColor({
}); color: "rgba(255, 0, 0, 0.6)"
});
}
const tabsData = new Map(); const tabsData = new Map();
function getTabData(tabId){ function getTabData(tabId){
@ -80,19 +82,26 @@
!lists.get("ignore").match(url) !lists.get("ignore").match(url)
){ ){
browser.pageAction.show(tabId); browser.pageAction.show(tabId);
browser.pageAction.setIcon({ if (browser.pageAction.setIcon){
browser.pageAction.setIcon({
tabId: tabId,
path: paths.pageAction[settings.highlightPageAction]
});
}
}
if (browser.browserAction.setIcon){
browser.browserAction.setIcon({
tabId: tabId, tabId: tabId,
path: paths.pageAction[settings.highlightPageAction] path: paths.browserAction[getBrowserActionIconName(tabData, true)]
}); });
} }
browser.browserAction.setIcon({
tabId: tabId,
path: paths.browserAction[getBrowserActionIconName(tabData, true)]
});
const apis = tabData.apis; const apis = tabData.apis;
apis.add(api); apis.add(api);
if (settings.get("displayBadge", url)){ if (
settings.get("displayBadge", url) &&
browser.browserAction.setBadgeText
){
browser.browserAction.setBadgeText({ browser.browserAction.setBadgeText({
tabId: tabId, tabId: tabId,
text: apis.size > 1? apis.size.toString(): api.charAt(0).toUpperCase() text: apis.size > 1? apis.size.toString(): api.charAt(0).toUpperCase()
@ -126,18 +135,24 @@
tabData.whitelisted = isWhitelisted(url); tabData.whitelisted = isWhitelisted(url);
browser.pageAction.hide(tabId); browser.pageAction.hide(tabId);
browser.pageAction.setIcon({ if (browser.pageAction.setIcon){
tabId: tabId, browser.pageAction.setIcon({
path: paths.pageAction.none tabId: tabId,
}); path: paths.pageAction.none
browser.browserAction.setIcon({ });
tabId: tabId, }
path: paths.browserAction[getBrowserActionIconName(tabData, false)] if (browser.browserAction.setIcon){
}); browser.browserAction.setIcon({
browser.browserAction.setBadgeText({ tabId: tabId,
tabId: tabId, path: paths.browserAction[getBrowserActionIconName(tabData, false)]
text: "" });
}); }
if (browser.browserAction.setBadgeText){
browser.browserAction.setBadgeText({
tabId: tabId,
text: ""
});
}
let browserActionTitle = browser.i18n.getMessage("browserAction_title_default"); let browserActionTitle = browser.i18n.getMessage("browserAction_title_default");
if (tabData.whitelisted){ if (tabData.whitelisted){
browserActionTitle += browser.i18n.getMessage("browserAction_title_whitelisted").replace(/{url}/g, url); browserActionTitle += browser.i18n.getMessage("browserAction_title_whitelisted").replace(/{url}/g, url);
@ -165,14 +180,16 @@
settings.on("displayBadge", function({newValue}){ settings.on("displayBadge", function({newValue}){
if (!newValue){ if (!newValue){
logging.message("badge was disabled -> hide all badges"); logging.message("badge was disabled -> hide all badges");
browser.tabs.query({}).then(function(tabs){ if (browser.browserAction.setBadgeText){
tabs.forEach(function(tab){ browser.tabs.query({}).then(function(tabs){
browser.browserAction.setBadgeText({ tabs.forEach(function(tab){
tabId: tab.id, browser.browserAction.setBadgeText({
text: "" tabId: tab.id,
text: ""
});
}); });
}); });
}); }
} }
}); });
}()); }());