OLD | NEW |
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-2015 Eyeo GmbH | 3 * Copyright (C) 2006-2015 Eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 shouldAllow: function({contentType, location, frames, isPrivate}) | 105 shouldAllow: function({contentType, location, frames, isPrivate}) |
106 { | 106 { |
107 let hits = []; | 107 let hits = []; |
108 | 108 |
109 function addHit(frameIndex, contentType, docDomain, thirdParty, location, fi
lter) | 109 function addHit(frameIndex, contentType, docDomain, thirdParty, location, fi
lter) |
110 { | 110 { |
111 if (filter && !isPrivate) | 111 if (filter && !isPrivate) |
112 FilterStorage.increaseHitCount(filter); | 112 FilterStorage.increaseHitCount(filter); |
113 hits.push({ | 113 hits.push({ |
114 frameIndex, contentType, docDomain, thirdParty, location, | 114 frameIndex, contentType, docDomain, thirdParty, location, |
115 filter: filter ? filter.text : null | 115 filter: filter ? filter.text : null, |
| 116 filterType: filter ? filter.type : null |
116 }); | 117 }); |
117 } | 118 } |
118 | 119 |
119 function response(allow, collapse) | 120 function response(allow, collapse) |
120 { | 121 { |
121 return {allow, collapse, hits}; | 122 return {allow, collapse, hits}; |
122 } | 123 } |
123 | 124 |
124 // Ignore whitelisted schemes | 125 // Ignore whitelisted schemes |
125 if (!this.isBlockableScheme(location)) | 126 if (!this.isBlockableScheme(location)) |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
399 if (!wnd || wnd.closed) | 400 if (!wnd || wnd.closed) |
400 return; | 401 return; |
401 | 402 |
402 if (entry.type == "OBJECT") | 403 if (entry.type == "OBJECT") |
403 { | 404 { |
404 node.removeEventListener("mouseover", objectMouseEventHander, true); | 405 node.removeEventListener("mouseover", objectMouseEventHander, true); |
405 node.removeEventListener("mouseout", objectMouseEventHander, true); | 406 node.removeEventListener("mouseout", objectMouseEventHander, true); |
406 } | 407 } |
407 Policy.processNode(wnd, node, entry.type, entry.location, true); | 408 Policy.processNode(wnd, node, entry.type, entry.location, true); |
408 } | 409 } |
OLD | NEW |