| 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-present eyeo GmbH | 3 * Copyright (C) 2006-present 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 panel.records.push({request, filter}); | 108 panel.records.push({request, filter}); |
| 109 } | 109 } |
| 110 } | 110 } |
| 111 | 111 |
| 112 function matchRequest(request) | 112 function matchRequest(request) |
| 113 { | 113 { |
| 114 return defaultMatcher.matchesAny( | 114 return defaultMatcher.matchesAny( |
| 115 request.url, | 115 request.url, |
| 116 RegExpFilter.typeMap[request.type], | 116 RegExpFilter.typeMap[request.type], |
| 117 request.docDomain, | 117 request.docDomain, |
| 118 request.thirdParty, | |
| 119 request.sitekey, | 118 request.sitekey, |
| 120 request.specificOnly | 119 request.specificOnly |
| 121 ); | 120 ); |
| 122 } | 121 } |
| 123 | 122 |
| 124 function onBeforeRequest(details) | 123 function onBeforeRequest(details) |
| 125 { | 124 { |
| 126 let panel = panels.get(details.tabId); | 125 let panel = panels.get(details.tabId); |
| 127 | 126 |
| 128 // Clear the devtools panel and reload the inspected tab without caching | 127 // Clear the devtools panel and reload the inspected tab without caching |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 ext.pages.onLoading.removeListener(onLoading); | 280 ext.pages.onLoading.removeListener(onLoading); |
| 282 filterNotifier.off("filter.added", onFilterAdded); | 281 filterNotifier.off("filter.added", onFilterAdded); |
| 283 filterNotifier.off("filter.removed", onFilterRemoved); | 282 filterNotifier.off("filter.removed", onFilterRemoved); |
| 284 filterNotifier.off("subscription.added", onSubscriptionAdded); | 283 filterNotifier.off("subscription.added", onSubscriptionAdded); |
| 285 } | 284 } |
| 286 }); | 285 }); |
| 287 | 286 |
| 288 HitLogger.addListener(inspectedTabId, hitListener); | 287 HitLogger.addListener(inspectedTabId, hitListener); |
| 289 panels.set(inspectedTabId, panel); | 288 panels.set(inspectedTabId, panel); |
| 290 }); | 289 }); |
| OLD | NEW |