Index: webrequest.js |
=================================================================== |
--- a/webrequest.js |
+++ b/webrequest.js |
@@ -170,35 +170,17 @@ function checkRequest(type, tabId, url, |
var documentUrl = getFrameUrl(tabId, frameId); |
if (!documentUrl) |
return false; |
var requestHost = extractHostFromURL(url); |
var documentHost = extractHostFromURL(documentUrl); |
var thirdParty = isThirdParty(requestHost, documentHost); |
- var filter = defaultMatcher.matchesAny(url, type, documentHost, thirdParty); |
- |
- if (filter instanceof BlockingFilter) |
- { |
- var collapse = filter.collapse; |
- if (collapse == null) |
- collapse = (localStorage["hidePlaceholders"] != "false"); |
- if (collapse && (type == "SUBDOCUMENT" || type == "IMAGE")) |
- { |
- chrome.tabs.sendMessage(tabId, { |
- reqtype: "hide-element", |
- type: type, |
- url: url, |
- documentUrl: documentUrl |
- }); |
- } |
- } |
- |
- return filter; |
+ return defaultMatcher.matchesAny(url, type, documentHost, thirdParty); |
} |
function isFrameWhitelisted(tabId, frameId, type) |
{ |
var parent = frameId; |
while (parent != -1) |
{ |
var parentData = getFrameData(tabId, parent); |