1
0
mirror of https://github.com/kkapsner/CanvasBlocker synced 2024-12-22 21:00:23 +01:00

Page action refinements.

This commit is contained in:
kkapsner 2017-07-18 16:19:32 +02:00
parent 72a2904b0a
commit b7acfbb2f9
2 changed files with 47 additions and 7 deletions

View File

@ -4,6 +4,7 @@
body { body {
margin: 5px; margin: 5px;
white-space: nowrap;
} }
#prints { #prints {
@ -11,3 +12,14 @@ body {
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
button.inspectImage {
display: none;
}
.imageAvailable button.inspectImage {
display: initial;
}
img {
border: 1px solid black;
}

View File

@ -15,6 +15,25 @@ function modalPrompt(message, defaultValue){
}); });
} }
function log(...args){
function leftPad(str, char, pad){
str = "" + str;
return char.repeat(pad - str.length) + str;
}
args.unshift("page action script:");
var now = new Date();
args.unshift(
now.getFullYear() + "-" +
leftPad(now.getMonth() + 1, "0", 2) + "-" +
leftPad(now.getDate(), "0", 2) + " " +
leftPad(now.getHours(), "0", 2) + ":" +
leftPad(now.getMinutes(), "0", 2) + ":" +
leftPad(now.getSeconds(), "0", 2) + "." +
leftPad(now.getMilliseconds(), "0", 3)
);
console.log.apply(console, args);
}
Promise.all([ Promise.all([
browser.tabs.query({active: true, currentWindow: true}), browser.tabs.query({active: true, currentWindow: true}),
browser.storage.local.get().then(function(data){ browser.storage.local.get().then(function(data){
@ -42,6 +61,9 @@ Promise.all([
displayCallingStack: function({errorStack}){ displayCallingStack: function({errorStack}){
alert(parseErrorStack(errorStack)); alert(parseErrorStack(errorStack));
}, },
inspectImage: function({dataURL}){
document.body.innerHTML = "<img src=" + dataURL + ">";
},
ignorelistDomain: function({url}){ ignorelistDomain: function({url}){
var domain = url.host; var domain = url.host;
modalPrompt( modalPrompt(
@ -86,8 +108,8 @@ Promise.all([
var tab = tabs[0]; var tab = tabs[0];
browser.runtime.onMessage.addListener(function(data){ browser.runtime.onMessage.addListener(function(data){
if (Array.isArray(data["canvasBlocker-notifications"])){ if (Array.isArray(data["canvasBlocker-notifications"])){
log("got notifications", data);
var ul = document.getElementById("prints"); var ul = document.getElementById("prints");
ul.innerHTML = "";
data["canvasBlocker-notifications"].forEach(function(notification){ data["canvasBlocker-notifications"].forEach(function(notification){
console.log(notification); console.log(notification);
@ -115,18 +137,19 @@ Promise.all([
var actions = document.createElement("span"); var actions = document.createElement("span");
actions.className = "actions"; actions.className = "actions";
var data = {url, errorStack: notification.errorStack, notification}; var data = {url, errorStack: notification.errorStack, notification, dataURL: notification.dataURL};
Object.keys(actionsCallbacks).forEach(function(key){ Object.keys(actionsCallbacks).forEach(function(key, i){
var button = document.createElement("button"); var button = document.createElement("button");
button.className = key;
button.textContent = browser.i18n.getMessage(key); button.textContent = browser.i18n.getMessage(key);
button.addEventListener("click", function(){actionsCallbacks[key](data);}); button.addEventListener("click", function(){actionsCallbacks[key](data);});
actions.appendChild(button); actions.appendChild(button);
if (i % 3 === 2){
actions.appendChild(document.createElement("br"));
}
}); });
if (notification.dataURL){ if (notification.dataURL){
var button = document.createElement("button"); actions.classList.add("imageAvailable");
button.textContent = browser.i18n.getMessage("inspectImage");
button.addEventListener("click", function(){document.body.innerHTML = "<img src=" + notification.dataURL + ">";});
actions.appendChild(button);
} }
li.appendChild(actions); li.appendChild(actions);
@ -134,12 +157,17 @@ Promise.all([
}); });
} }
}); });
log("clearing the display");
var ul = document.getElementById("prints");
ul.innerHTML = "";
log("request notifications from tab", tab.id);
browser.tabs.sendMessage( browser.tabs.sendMessage(
tab.id, tab.id,
{ {
"canvasBlocker-sendNotifications": tab.id "canvasBlocker-sendNotifications": tab.id
} }
); );
log("waiting for notifications");
}).catch(function(e){ }).catch(function(e){
console.error(e); console.error(e);
}); });