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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 type: "popup" | 158 type: "popup" |
159 }, | 159 }, |
160 popupPage => | 160 popupPage => |
161 { | 161 { |
162 let popupPageId = popupPage.id; | 162 let popupPageId = popupPage.id; |
163 function onRemoved(removedPageId) | 163 function onRemoved(removedPageId) |
164 { | 164 { |
165 if (popupPageId == removedPageId) | 165 if (popupPageId == removedPageId) |
166 { | 166 { |
167 sender.page.sendMessage({ | 167 sender.page.sendMessage({ |
168 type: "blockelement-popup-closed", | 168 type: "composer.content.dialogClosed", |
169 popupId: popupPageId | 169 popupId: popupPageId |
170 }); | 170 }); |
171 ext.pages.onRemoved.removeListener(onRemoved); | 171 ext.pages.onRemoved.removeListener(onRemoved); |
172 } | 172 } |
173 } | 173 } |
174 ext.pages.onRemoved.addListener(onRemoved); | 174 ext.pages.onRemoved.addListener(onRemoved); |
175 resolve(popupPageId); | 175 resolve(popupPageId); |
176 }); | 176 }); |
177 }); | 177 }); |
178 }); | 178 }); |
179 | 179 |
180 port.on("composer.getFilters", (message, sender) => | 180 port.on("composer.getFilters", (message, sender) => |
181 { | 181 { |
182 return composeFilters({ | 182 return composeFilters({ |
183 tagName: message.tagName, | 183 tagName: message.tagName, |
184 id: message.id, | 184 id: message.id, |
185 src: message.src, | 185 src: message.src, |
186 style: message.style, | 186 style: message.style, |
187 classes: message.classes, | 187 classes: message.classes, |
188 urls: message.urls, | 188 urls: message.urls, |
189 type: message.mediatype, | 189 type: message.mediatype, |
190 baseURL: message.baseURL, | 190 baseURL: message.baseURL, |
191 page: sender.page, | 191 page: sender.page, |
192 frame: sender.frame | 192 frame: sender.frame |
193 }); | 193 }); |
194 }); | 194 }); |
OLD | NEW |