Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: lib/filterComposer.js

Issue 29339054: Issue 3872 - Fixed incorrect message type causing composer behavior to persists after popup is clos… (Closed)
Patch Set: Created March 24, 2016, 3:08 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 type: "popup" 207 type: "popup"
208 }, 208 },
209 popupPage => 209 popupPage =>
210 { 210 {
211 let popupPageId = popupPage.id; 211 let popupPageId = popupPage.id;
212 function onRemoved(removedPageId) 212 function onRemoved(removedPageId)
213 { 213 {
214 if (popupPageId == removedPageId) 214 if (popupPageId == removedPageId)
215 { 215 {
216 sender.page.sendMessage({ 216 sender.page.sendMessage({
217 type: "blockelement-popup-closed", 217 type: "composer.content.dialogClosed",
218 popupId: popupPageId 218 popupId: popupPageId
219 }); 219 });
220 ext.pages.onRemoved.removeListener(onRemoved); 220 ext.pages.onRemoved.removeListener(onRemoved);
221 } 221 }
222 } 222 }
223 ext.pages.onRemoved.addListener(onRemoved); 223 ext.pages.onRemoved.addListener(onRemoved);
224 resolve(popupPageId); 224 resolve(popupPageId);
225 }); 225 });
226 }); 226 });
227 }); 227 });
(...skipping 11 matching lines...) Expand all
239 baseURL: message.baseURL, 239 baseURL: message.baseURL,
240 page: sender.page, 240 page: sender.page,
241 frame: sender.frame 241 frame: sender.frame
242 }); 242 });
243 }); 243 });
244 244
245 ext.pages.onLoading.addListener(page => 245 ext.pages.onLoading.addListener(page =>
246 { 246 {
247 page.sendMessage({type: "composer.content.finished"}); 247 page.sendMessage({type: "composer.content.finished"});
248 }); 248 });
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld