security-and-privacy/CanvasBlocker
security-and-privacy/CanvasBlocker
1
0
Fork 0
mirror of https://github.com/kkapsner/CanvasBlocker synced 2025-07-03 12:06:31 +02:00
Code Releases Activity

Merge remote-tracking branch 'origin/master' into notificationOnFakeReadout

Browse source 
Conflicts:
	canvasblocker.xpi
	data/inject.js
	lib/main.js
This commit is contained in:
kkapsner 2015-04-15 12:11:51 +02:00
commit a8f636ba6f
3 changed files with 29 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/main.js
View file

@ -90,7 +90,6 @@
});
function checkURL(url){
url = new URL(url);
var mode = "block";
switch (prefs.blockMode){
case "blockEverything":
@ -136,8 +135,18 @@
}
function checkWorker(worker){
try {
var mode = checkURL(worker.url);
worker.port.emit(mode, false, prefs.askOnlyOnce);
var mode;
var url = new URL(worker.url)
if (
(url.protocol === "about:") ||
(prefs.allowPDFCanvas && worker.tab.contentType.match(/\/pdf$/i))
){
mode = "unblock";
}
else {
var mode = checkURL(url);
}
worker.port.emit(mode, prefs.askOnlyOnce);
}
catch (e){
console.log("Error updating " + worker.url + ": " + e.message);
@ -161,14 +170,6 @@
worker.on("detach", function(){
array.remove(workers, this);
});
worker.port.on("isPDF", function(blocking){
if (prefs.allowPDFCanvas){
this.emit("unblock");
}
else {
this.emit(blocking, true, prefs.askOnlyOnce);
}
});
["", "Readout"].forEach(function(type){
["", "Visible", "Invisible"].forEach(function(visibility){
var text = "askFor" + visibility + type + "Permission";