| Index: lib/contentPolicy.js |
| =================================================================== |
| --- a/lib/contentPolicy.js |
| +++ b/lib/contentPolicy.js |
| @@ -91,17 +91,17 @@ var Policy = exports.Policy = |
| Utils.styleService.unregisterSheet(collapseStyle, Ci.nsIStyleSheetService.USER_SHEET); |
| }); |
| }, |
| /** |
| * Checks whether a node should be blocked, hides it if necessary |
| * @param {Object} data request data |
| * @param {String} data.contentType |
| - * @param {String} data.location |
| + * @param {String} data.location location of the request, filter key if contentType is ELEMHIDE |
| * @param {Object[]} data.frames |
| * @param {Boolean} data.isPrivate true if the request belongs to a private browsing window |
| * @return {Object} An object containing properties block, collapse and hits |
| * indicating how this request should be handled. |
| */ |
| shouldAllow: function({contentType, location, frames, isPrivate}) |
| { |
| let hits = []; |
| @@ -169,17 +169,17 @@ var Policy = exports.Policy = |
| if (frame == testSitekeyFrame) |
| [testSitekey, testSitekeyFrame] = getSitekey(frames.slice(i + 1)); |
| } |
| } |
| if (!match && contentType == "ELEMHIDE") |
| { |
| - match = location; |
| + match = ElemHide.getFilterByKey(location); |
| location = match.text.replace(/^.*?#/, '#'); |
| if (!match.isActiveOnDomain(docDomain)) |
| return response(true, false); |
| let exception = ElemHide.getException(match, docDomain); |
| if (exception) |
| { |