| Left: | ||
| Right: |
| 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 171 nogenericMatch); | 171 nogenericMatch); |
| 172 } | 172 } |
| 173 | 173 |
| 174 if (frame == testSitekeyFrame) | 174 if (frame == testSitekeyFrame) |
| 175 [testSitekey, testSitekeyFrame] = getSitekey(frames.slice(i + 1)); | 175 [testSitekey, testSitekeyFrame] = getSitekey(frames.slice(i + 1)); |
| 176 } | 176 } |
| 177 } | 177 } |
| 178 | 178 |
| 179 if (!match && contentType == "ELEMHIDE") | 179 if (!match && contentType == "ELEMHIDE") |
| 180 { | 180 { |
| 181 match = location; | 181 match = ElemHide.getFilterByKey(location); |
|
tschuster
2015/11/05 15:39:36
So this is better, but we should still document th
Wladimir Palant
2015/11/06 11:29:00
Done.
| |
| 182 location = match.text.replace(/^.*?#/, '#'); | 182 location = match.text.replace(/^.*?#/, '#'); |
| 183 | 183 |
| 184 if (!match.isActiveOnDomain(docDomain)) | 184 if (!match.isActiveOnDomain(docDomain)) |
| 185 return response(true, false); | 185 return response(true, false); |
| 186 | 186 |
| 187 let exception = ElemHide.getException(match, docDomain); | 187 let exception = ElemHide.getException(match, docDomain); |
| 188 if (exception) | 188 if (exception) |
| 189 { | 189 { |
| 190 addHit(null, contentType, docDomain, false, location, exception); | 190 addHit(null, contentType, docDomain, false, location, exception); |
| 191 return response(true, false); | 191 return response(true, false); |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 403 if (!wnd || wnd.closed) | 403 if (!wnd || wnd.closed) |
| 404 return; | 404 return; |
| 405 | 405 |
| 406 if (entry.type == "OBJECT") | 406 if (entry.type == "OBJECT") |
| 407 { | 407 { |
| 408 node.removeEventListener("mouseover", objectMouseEventHander, true); | 408 node.removeEventListener("mouseover", objectMouseEventHander, true); |
| 409 node.removeEventListener("mouseout", objectMouseEventHander, true); | 409 node.removeEventListener("mouseout", objectMouseEventHander, true); |
| 410 } | 410 } |
| 411 Policy.processNode(wnd, node, entry.type, entry.location, true); | 411 Policy.processNode(wnd, node, entry.type, entry.location, true); |
| 412 } | 412 } |
| OLD | NEW |