1
0
mirror of https://github.com/kkapsner/CanvasBlocker synced 2024-10-31 18:38:45 +01:00

Added showCanvasWhileAsking

Fixes #175
This commit is contained in:
kkapsner 2018-01-04 13:36:18 +01:00
parent ab19ebd2c6
commit 77e079e5cc
7 changed files with 88 additions and 2 deletions

View File

@ -153,6 +153,20 @@
"message": "vortäuschen", "message": "vortäuschen",
"description": "" "description": ""
}, },
"showCanvasWhileAsking_title":{
"message": "Canvas-Inhalt anzeigen",
"description": ""
},
"showCanvasWhileAsking_description":{
"message": "Wenn möglich wird der Inhalt des Canvas angezeigt, bei dem um Erlaubnis gefragt wird.",
"description": ""
},
"showCanvasWhileAsking_message":{
"message": "Die Webseite will den Inhalt des folgenden Canvas auslesen:",
"description": ""
},
"blackList_description": { "blackList_description": {
"message": "Domänen oder URLs, die die <canvas>-API niemals verwenden dürfen. Mehrere Einträge müssen durch ein Komma getrennt werden.", "message": "Domänen oder URLs, die die <canvas>-API niemals verwenden dürfen. Mehrere Einträge müssen durch ein Komma getrennt werden.",
"description": "" "description": ""

View File

@ -153,6 +153,20 @@
"message": "fake", "message": "fake",
"description": "" "description": ""
}, },
"showCanvasWhileAsking_title":{
"message": "Show canvas content",
"description": ""
},
"showCanvasWhileAsking_description":{
"message": "Shows the content of the canvas for which the permission is asked if possible.",
"description": ""
},
"showCanvasWhileAsking_message":{
"message": "The web page wants to read the content of the following canvas:",
"description": ""
},
"blackList_description": { "blackList_description": {
"message": "Domains or URLs where the <canvas>-API should always be blocked. To add multiple entries, separate them by commas.", "message": "Domains or URLs where the <canvas>-API should always be blocked. To add multiple entries, separate them by commas.",
"description": "" "description": ""

View File

@ -131,12 +131,53 @@
return askStatus.answer[appearance.askCategory]; return askStatus.answer[appearance.askCategory];
} }
else { else {
let imgContainer = null;
if (type === "readout" && prefs("showCanvasWhileAsking") && canvas){
try {
let content = canvas.toDataURL();
let document = window.top.document;
imgContainer = document.createElement("div");
imgContainer.style.cssText = `
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, 0.7);
color: white;
text-align: center;
z-index: 100000000000000;
padding: 1em;`;
let heading = document.createElement("h1");
heading.textContent = "CanvasBlocker";
imgContainer.appendChild(heading);
let text = document.createElement("div");
text.style.margin = "0.5em auto";
text.textContent = browser.i18n.getMessage("showCanvasWhileAsking_message");
imgContainer.appendChild(text);
let img = document.createElement("img");
img.style.backgroundColor = "white";
img.style.border = "2px solid lightgray";
img.src = HTMLCanvasElement.prototype.toDataURL.call(canvas);
imgContainer.appendChild(img);
document.body.appendChild(imgContainer);
}
catch (e){
// unable to read the canvas
}
}
// asking // asking
var msg = askMode.askText[appearance.text]; var msg = askMode.askText[appearance.text];
if (prefs("showCallingFile")){ if (prefs("showCallingFile")){
msg += parseErrorStack(errorStack).toString(_); msg += parseErrorStack(errorStack).toString(_);
} }
answer = window.top.confirm(msg)? "allow": prefs("askDenyMode"); answer = window.top.confirm(msg)? "allow": prefs("askDenyMode");
if (imgContainer && imgContainer.parentNode){
imgContainer.parentNode.removeChild(imgContainer);
}
if (prefs("askOnlyOnce") === "combined"){ if (prefs("askOnlyOnce") === "combined"){
["context", "readout", "input"].forEach(function(type){ ["context", "readout", "input"].forEach(function(type){

View File

@ -232,7 +232,13 @@
funcStatus.mode = ask({ funcStatus.mode = ask({
window: window, window: window,
type: changedFunction.type, type: changedFunction.type,
canvas: this, canvas: this instanceof HTMLCanvasElement?
this:
(
this.canvas instanceof HTMLCanvasElement?
this.canvas:
false
),
errorStack: error.stack errorStack: error.stack
}); });
} }

View File

@ -106,6 +106,10 @@
defaultValue: "block", defaultValue: "block",
options: ["block", "fake"] options: ["block", "fake"]
}, },
{
name: "showCanvasWhileAsking",
defaultValue: true
},
{ {
name: "showNotifications", name: "showNotifications",
defaultValue: true, defaultValue: true,

View File

@ -27,6 +27,13 @@
"displayAdvancedSettings": [true] "displayAdvancedSettings": [true]
} }
}, },
{
"name": "showCanvasWhileAsking",
"displayDependencies": {
"blockMode": ["askReadout", "ask"],
"displayAdvancedSettings": [true]
}
},
"faking", "faking",
{ {
"name": "minFakeSize", "name": "minFakeSize",

View File

@ -3,7 +3,7 @@ Version 0.4.5:
- -
new features: new features:
- - Added way to inspect canvas content in ask mode while being asked
fixes: fixes:
- prevent possible double faking - prevent possible double faking