security-and-privacy/CanvasBlocker
security-and-privacy/CanvasBlocker
1
0
Fork 0
mirror of https://github.com/kkapsner/CanvasBlocker synced 2025-01-09 21:24:46 +01:00
Code Releases Activity

Activated settings migration to 0.3

Browse Source
This commit is contained in:
kkapsner 2017-12-08 20:25:08 +01:00
parent 74863d3c98
commit d787b84b13
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/settingDefinitions.js
View File

@ -149,7 +149,7 @@
}, },
{ {
name: "storageVersion", name: "storageVersion",
defaultValue: 0.2, defaultValue: 0.3,
fixed: true fixed: true
} }
]; ];

17
lib/settings.js
View File

@ -493,7 +493,9 @@
var urlSettings = {}; var urlSettings = {};
(oldStorage.blackList || "").split(",").forEach(function(url){ (oldStorage.blackList || "").split(",")
.filter(function(url){return !!url.trim();})
.forEach(function(url){
var entry = urlSettings[url]; var entry = urlSettings[url];
if (!entry){ if (!entry){
entry = {url, blockMode: "block"}; entry = {url, blockMode: "block"};
@ -501,7 +503,9 @@
newStorage.urlSettings.push(entry); newStorage.urlSettings.push(entry);
} }
}); });
(oldStorage.whiteList || "").split(",").forEach(function(url){ (oldStorage.whiteList || "").split(",")
.filter(function(url){return !!url.trim();})
.forEach(function(url){
var entry = urlSettings[url]; var entry = urlSettings[url];
if (!entry){ if (!entry){
entry = {url, blockMode: "allow"}; entry = {url, blockMode: "allow"};
@ -509,7 +513,9 @@
newStorage.urlSettings.push(entry); newStorage.urlSettings.push(entry);
} }
}); });
(oldStorage.ignoreList || "").split(",").forEach(function(url){ (oldStorage.ignoreList || "").split(",")
.filter(function(url){return !!url.trim();})
.forEach(function(url){
var entry = urlSettings[url]; var entry = urlSettings[url];
if (!entry){ if (!entry){
entry = {url, showNotifications: false}; entry = {url, showNotifications: false};
@ -520,6 +526,11 @@
entry.showNotifications = false; entry.showNotifications = false;
} }
}); });
["whiteList", "blackList", "ignoreList"].forEach(function(list){
if (oldStorage.hasOwnProperty(list)){
newStorage[list] = "";
}
});
return newStorage; return newStorage;
} }