mirror of
https://github.com/kkapsner/CanvasBlocker
synced 2025-07-04 12:36:37 +02:00
Introduced stackList.
This commit is contained in:
parent
24d67113d6
commit
d2f5a0cca1
6 changed files with 112 additions and 24 deletions
|
@ -23,6 +23,14 @@ var _ = function(name, replace){
|
|||
return str;
|
||||
};
|
||||
|
||||
function check(stack, url, blockMode){
|
||||
if (prefs.enableStackList && checkStack(stack)){
|
||||
return "allow";
|
||||
}
|
||||
else {
|
||||
return checkURL(url, blockMode);
|
||||
}
|
||||
}
|
||||
|
||||
function checkURL(url, blockMode){
|
||||
"use strict";
|
||||
|
@ -67,6 +75,11 @@ function checkURL(url, blockMode){
|
|||
return mode;
|
||||
}
|
||||
|
||||
function checkStack(stack){
|
||||
"use strict";
|
||||
|
||||
return lists.get("stack").match(stack);
|
||||
}
|
||||
|
||||
// Stack parsing
|
||||
function parseStackEntry(entry){
|
||||
|
@ -75,17 +88,32 @@ function parseStackEntry(entry){
|
|||
var m = /@(.*):(\d*):(\d*)$/.exec(entry) || ["", entry, "--", "--"];
|
||||
return {
|
||||
url: m[1],
|
||||
line: m[2],
|
||||
column: m[3],
|
||||
line: parseInt(m[2], 10),
|
||||
column: parseInt(m[3], 10),
|
||||
raw: entry
|
||||
};
|
||||
}
|
||||
|
||||
function stackRuleMatch(stackEntry, stackRule){
|
||||
if (!stackEntry){
|
||||
return false;
|
||||
}
|
||||
if (stackEntry.url !== stackRule.url){
|
||||
return false;
|
||||
}
|
||||
if ((typeof stackRule.line) !== "undefined" && stackEntry.line !== stackRule.line){
|
||||
return false;
|
||||
}
|
||||
if ((typeof stackRule.column) !== "undefined" && stackEntry.column !== stackRule.column){
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// parse calling stack
|
||||
function errorToCallingStackMsg(error){
|
||||
function errorToCallingStack(error){
|
||||
"use strict";
|
||||
|
||||
var msg = "";
|
||||
var callers = error.stack.trim().split("\n");
|
||||
//console.log(callers);
|
||||
var findme = callers.shift(); // Remove us from the stack
|
||||
|
@ -96,20 +124,39 @@ function errorToCallingStackMsg(error){
|
|||
var doubleStackStart = caller.search(findme) !== -1;
|
||||
inDoubleStack = inDoubleStack || doubleStackStart;
|
||||
return !inDoubleStack;
|
||||
});
|
||||
msg += "\n\n" + _("sourceOutput") + ": ";
|
||||
if (prefs.showCompleteCallingStack){
|
||||
msg += callers.reduce(function(stack, c){
|
||||
return stack + "\n\t" + _("stackEntryOutput", parseStackEntry(c));
|
||||
}, "");
|
||||
}
|
||||
else{
|
||||
msg += _("stackEntryOutput", parseStackEntry(callers[0]));
|
||||
}
|
||||
|
||||
return msg;
|
||||
}).map(parseStackEntry);
|
||||
return {
|
||||
toString: function(){
|
||||
var msg = "";
|
||||
msg += "\n\n" + _("sourceOutput") + ": ";
|
||||
if (prefs.showCompleteCallingStack){
|
||||
msg += callers.reduce(function(stack, c){
|
||||
return stack + "\n\t" + _("stackEntryOutput", c);
|
||||
}, "");
|
||||
}
|
||||
else{
|
||||
msg += _("stackEntryOutput", callers[0]);
|
||||
}
|
||||
|
||||
return msg;
|
||||
},
|
||||
match: function(stackRule){
|
||||
if (typeof stackRule.stackPosition !== "undefined"){
|
||||
var pos = stackRule.stackPosition;
|
||||
if (pos < 0){
|
||||
pos += callers.length;
|
||||
}
|
||||
return stackRuleMatch(callers[pos], stackRule);
|
||||
}
|
||||
else {
|
||||
return callers.some(function(stackEntry){
|
||||
return stackRuleMatch(stackEntry, stackRule);
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
exports.checkURL = checkURL;
|
||||
exports.check = check;
|
||||
exports.parseStackEntry = parseStackEntry;
|
||||
exports.errorToCallingStackMsg = errorToCallingStackMsg;
|
||||
exports.errorToCallingStack = errorToCallingStack;
|
Loading…
Add table
Add a link
Reference in a new issue