| Left: | ||
| Right: |
| LEFT | RIGHT |
|---|---|
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <http://adblockplus.org/>, | 2 * This file is part of Adblock Plus <http://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2014 Eyeo GmbH | 3 * Copyright (C) 2006-2014 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 42 { | 42 { |
| 43 // Execute delayed to prevent multiple executions in a quick succession | 43 // Execute delayed to prevent multiple executions in a quick succession |
| 44 if (onFilterChangeTimeout != null) | 44 if (onFilterChangeTimeout != null) |
| 45 window.clearTimeout(onFilterChangeTimeout); | 45 window.clearTimeout(onFilterChangeTimeout); |
| 46 onFilterChangeTimeout = window.setTimeout(onFilterChange, 2000); | 46 onFilterChangeTimeout = window.setTimeout(onFilterChange, 2000); |
| 47 } | 47 } |
| 48 }); | 48 }); |
| 49 | 49 |
| 50 function onBeforeRequest(url, type, page, frame) | 50 function onBeforeRequest(url, type, page, frame) |
| 51 { | 51 { |
| 52 if (!/^https?:/.test(url) || isFrameWhitelisted(page, frame)) | 52 if (isFrameWhitelisted(page, frame)) |
|
Sebastian Noack
2014/07/15 22:47:44
Any reasons that you don't just change the url pat
Wladimir Palant
2014/07/16 07:12:29
Changing this in chrome/ext/background.js seems to
| |
| 53 return true; | 53 return true; |
| 54 | 54 |
| 55 var docDomain = extractHostFromFrame(frame); | 55 var docDomain = extractHostFromFrame(frame); |
| 56 var filter = defaultMatcher.matchesAny( | 56 var filter = defaultMatcher.matchesAny( |
| 57 url, | 57 url, |
| 58 type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase(), | 58 type == "sub_frame" ? "SUBDOCUMENT" : type.toUpperCase(), |
| 59 docDomain, | 59 docDomain, |
| 60 isThirdParty(extractHostFromURL(url), docDomain) | 60 isThirdParty(extractHostFromURL(url), docDomain) |
| 61 ); | 61 ); |
| 62 | 62 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 96 var header = details.responseHeaders[i]; | 96 var header = details.responseHeaders[i]; |
| 97 if (header.name.toLowerCase() == "x-adblock-key" && header.value) | 97 if (header.name.toLowerCase() == "x-adblock-key" && header.value) |
| 98 processKeyException(header.value, page, frame); | 98 processKeyException(header.value, page, frame); |
| 99 } | 99 } |
| 100 | 100 |
| 101 var notificationToShow = Notification.getNextToShow(details.url); | 101 var notificationToShow = Notification.getNextToShow(details.url); |
| 102 if (notificationToShow) | 102 if (notificationToShow) |
| 103 showNotification(notificationToShow); | 103 showNotification(notificationToShow); |
| 104 } | 104 } |
| 105 | 105 |
| 106 chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["<a ll_urls>"]}, ["responseHeaders"]); | 106 chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["ht tp://*/*", "https://*/*"]}, ["responseHeaders"]); |
| 107 } | 107 } |
| LEFT | RIGHT |