security-and-privacy/CanvasBlocker
security-and-privacy/CanvasBlocker
1
0
Fork 0
mirror of https://github.com/kkapsner/CanvasBlocker synced 2025-03-13 11:44:12 +01:00
Code Releases Activity

Further code cleanup

Browse Source
This commit is contained in:
kkapsner 2014-10-14 01:06:11 +02:00
parent feb16823c1
commit f5a2c46f24
1 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/main.js
View File

@ -1,5 +1,6 @@
/* global console */
(function(){ (function(){
"use strict"; "use strict";
function getDomainRegExpList(domainList){ function getDomainRegExpList(domainList){
var list = domainList var list = domainList
@ -14,7 +15,7 @@
var regExp; var regExp;
var domain = !!entry.match(/^[\w.]+$/); var domain = !!entry.match(/^[\w.]+$/);
if (domain){ if (domain){
regExp = new RegExp("(?:^|\\.)" + entry.replace(/([\\\+\*\?\[\^\]\$\(\)\{\}\=\!\|\.])/g, "\\$1") + "\\.?$", "i") regExp = new RegExp("(?:^|\\.)" + entry.replace(/([\\\+\*\?\[\^\]\$\(\)\{\}\=\!\|\.])/g, "\\$1") + "\\.?$", "i");
} }
else { else {
regExp = new RegExp(entry, "i"); regExp = new RegExp(entry, "i");
@ -34,8 +35,8 @@
list.match = function(url){ list.match = function(url){
return this.some(function(entry){ return this.some(function(entry){
return entry.match(url); return entry.match(url);
}) });
} };
return list; return list;
} }
@ -45,7 +46,7 @@
var array = require("sdk/util/array"); var array = require("sdk/util/array");
var preferences = require("sdk/simple-prefs"); var preferences = require("sdk/simple-prefs");
var prefs = preferences.prefs; var prefs = preferences.prefs;
var {URL} = require("sdk/url"); var URL = require("sdk/url").URL;
var _ = require("sdk/l10n").get; var _ = require("sdk/l10n").get;
// preferences // preferences
@ -88,38 +89,8 @@
} }
break; break;
case "ask": case "ask":
if (whiteList.match(url)){
mode = "unblock";
}
else if (blackList.match(url)){
mode = "block";
}
else {
mode = "ask";
}
break;
case "blockReadout": case "blockReadout":
if (whiteList.match(url)){
mode = "unblock";
}
else if (blackList.match(url)){
mode = "block";
}
else {
mode = "blockReadout";
}
break;
case "fakeReadout": case "fakeReadout":
if (whiteList.match(url)){
mode = "unblock";
}
else if (blackList.match(url)){
mode = "block";
}
else {
mode = "fakeReadout";
}
break;
case "askReadout": case "askReadout":
if (whiteList.match(url)){ if (whiteList.match(url)){
mode = "unblock"; mode = "unblock";
@ -128,7 +99,7 @@
mode = "block"; mode = "block";
} }
else { else {
mode = "askReadout"; mode = prefs.blockMode;
} }
break; break;
case "blockOnlyBlackList": case "blockOnlyBlackList":