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

Hide lists

This commit is contained in:
kkapsner 2017-12-03 23:58:54 +01:00
parent 01780da9f5
commit ba8f35a9a8
3 changed files with 30 additions and 31 deletions

View File

@ -13,18 +13,18 @@
{ {
"name": "blockMode" "name": "blockMode"
}, },
{ // {
"name": "whiteList", // "name": "whiteList",
"displayDependencies": { // "displayDependencies": {
"blockMode": ["blockReadout", "fakeReadout", "fakeInput", "askReadout", "block", "ask"] // "blockMode": ["blockReadout", "fakeReadout", "fakeInput", "askReadout", "block", "ask"]
} // }
}, // },
{ // {
"name": "blackList", // "name": "blackList",
"displayDependencies": { // "displayDependencies": {
"blockMode": ["blockReadout", "fakeReadout", "fakeInput", "askReadout", "ask", "allow"] // "blockMode": ["blockReadout", "fakeReadout", "fakeInput", "askReadout", "ask", "allow"]
} // }
}, // },
{ {
"name": "askOnlyOnce", "name": "askOnlyOnce",
"displayDependencies": { "displayDependencies": {
@ -199,20 +199,20 @@
} }
] ]
}, },
{ // {
"name": "ignoreList", // "name": "ignoreList",
"displayDependencies": [ // "displayDependencies": [
{ // {
"blockMode": ["fakeReadout", "fakeInput"], // "blockMode": ["fakeReadout", "fakeInput"],
"showNotifications": [true] // "showNotifications": [true]
}, // },
{ // {
"blockMode": ["askReadout", "ask"], // "blockMode": ["askReadout", "ask"],
"askDenyMode": ["fake"], // "askDenyMode": ["fake"],
"showNotifications": [true] // "showNotifications": [true]
} // }
] // ]
}, // },
{ {
"name": "showCallingFile", "name": "showCallingFile",
"displayDependencies": { "displayDependencies": {

View File

@ -5,7 +5,6 @@
"use strict"; "use strict";
const settings = require("./settings"); const settings = require("./settings");
const lists = require("./lists");
const {parseErrorStack} = require("./callingStack"); const {parseErrorStack} = require("./callingStack");
const {error, warning, message, notice, verbose, setPrefix: setLogPrefix} = require("./logging"); const {error, warning, message, notice, verbose, setPrefix: setLogPrefix} = require("./logging");
setLogPrefix("page action script"); setLogPrefix("page action script");
@ -55,7 +54,7 @@
domain domain
).then(function(domain){ ).then(function(domain){
if (domain){ if (domain){
lists.appendTo("ignore", domain); settings.set("showNotifications", false, domain);
} }
window.close(); window.close();
}); });
@ -70,7 +69,7 @@
domain domain
).then(function(domain){ ).then(function(domain){
if (domain){ if (domain){
lists.appendTo("white", domain); settings.set("blockMode", "allow", domain);
} }
window.close(); window.close();
}); });
@ -105,7 +104,7 @@
"^" + url.href.replace(/([\\+*?[^\]$(){}=!|.])/g, "\\$1") + "$" "^" + url.href.replace(/([\\+*?[^\]$(){}=!|.])/g, "\\$1") + "$"
).then(function(url){ ).then(function(url){
if (url){ if (url){
lists.appendTo("white", url); settings.set("blockMode", "allow", url);
} }
window.close(); window.close();
}); });

View File

@ -3,7 +3,7 @@ Version 0.4.3:
- -
changes: changes:
- - hide white, black and ignore list as they can be done with the url specific settings. They are still present and working in the background.
new features: new features:
- reset settings - reset settings