| 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-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 85 // Invalid URL? | 85 // Invalid URL? |
| 86 } | 86 } |
| 87 | 87 |
| 88 for (let filter of filters) | 88 for (let filter of filters) |
| 89 { | 89 { |
| 90 RequestNotifier.addNodeData(subject.document, subject.top, { | 90 RequestNotifier.addNodeData(subject.document, subject.top, { |
| 91 contentType: "ELEMHIDE", | 91 contentType: "ELEMHIDE", |
| 92 docDomain: docDomain, | 92 docDomain: docDomain, |
| 93 thirdParty: false, | 93 thirdParty: false, |
| 94 // TODO: Show the actual matching selector here? | 94 // TODO: Show the actual matching selector here? |
| 95 location: filter.replace(/^.*?##/, ""), | 95 location: filter.replace(/^.*?##/, ""), |
|
Sebastian Noack
2017/03/29 12:58:41
Another change caused the second argument to addSe
Wladimir Palant
2017/03/29 13:28:52
It doesn't strictly require changes but we can ind
| |
| 96 filter: filter, | 96 filter: filter, |
| 97 filterType: "elemhideemulation" | 97 filterType: "elemhideemulation" |
| 98 }); | 98 }); |
| 99 } | 99 } |
| 100 } | 100 } |
| 101 ); | 101 ); |
| 102 | 102 |
| 103 handler.load(() => handler.apply()); | 103 handler.apply(); |
|
Sebastian Noack
2017/03/29 12:58:41
Note that this change is redundant with https://is
Wladimir Palant
2017/03/29 13:28:52
I've resolved it as a duplicate since that change
| |
| 104 }; | 104 }; |
| 105 | 105 |
| 106 subject.addEventListener("load", onReady); | 106 subject.addEventListener("load", onReady); |
| 107 }; | 107 }; |
| 108 | 108 |
| 109 Services.obs.addObserver(onContentWindow, "content-document-global-created", | 109 Services.obs.addObserver(onContentWindow, "content-document-global-created", |
| 110 false); | 110 false); |
| 111 onShutdown.add(() => | 111 onShutdown.add(() => |
| 112 { | 112 { |
| 113 Services.obs.removeObserver(onContentWindow, | 113 Services.obs.removeObserver(onContentWindow, |
| 114 "content-document-global-created"); | 114 "content-document-global-created"); |
| 115 }); | 115 }); |
| 116 } | 116 } |
| 117 | 117 |
| 118 initElemHideEmulation(); | 118 initElemHideEmulation(); |
| 119 })(); | 119 })(); |
| OLD | NEW |