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

Delta Between Two Patch Sets: lib/filterComposer.js

Issue 29532767: Issue 5593 - Use messaging in popup for prefs, whitelisting, and stats (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/
Left Patch Set: Use messaging for prefs I/O Created Aug. 31, 2017, 5:07 p.m.
Right Patch Set: Revert one more instance of ext.pages.open Created Sept. 27, 2017, 9:40 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « dependencies ('k') | lib/stats.js » ('j') | stats.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 193
194 FilterNotifier.on("page.WhitelistingStateRevalidate", updateContextMenu); 194 FilterNotifier.on("page.WhitelistingStateRevalidate", updateContextMenu);
195 195
196 Prefs.on("shouldShowBlockElementMenu", () => 196 Prefs.on("shouldShowBlockElementMenu", () =>
197 { 197 {
198 ext.pages.query({}, pages => 198 ext.pages.query({}, pages =>
199 { 199 {
200 for (let page of pages) 200 for (let page of pages)
201 updateContextMenu(page); 201 updateContextMenu(page);
202 }); 202 });
203 });
204
205 port.on("composer.isPageReady", (message, sender) =>
206 {
207 return readyPages.has(new ext.Page({id: message.pageId}));
203 }); 208 });
204 209
205 port.on("composer.ready", (message, sender) => 210 port.on("composer.ready", (message, sender) =>
206 { 211 {
207 readyPages.set(sender.page, null); 212 readyPages.set(sender.page, null);
208 updateContextMenu(sender.page); 213 updateContextMenu(sender.page);
209 }); 214 });
210 215
211 port.on("composer.openDialog", (message, sender) => 216 port.on("composer.openDialog", (message, sender) =>
212 { 217 {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 263
259 port.on("composer.quoteCSS", (message, sender) => 264 port.on("composer.quoteCSS", (message, sender) =>
260 { 265 {
261 return quoteCSS(message.CSS); 266 return quoteCSS(message.CSS);
262 }); 267 });
263 268
264 ext.pages.onLoading.addListener(page => 269 ext.pages.onLoading.addListener(page =>
265 { 270 {
266 page.sendMessage({type: "composer.content.finished"}); 271 page.sendMessage({type: "composer.content.finished"});
267 }); 272 });
LEFTRIGHT

Powered by Google App Engine
This is Rietveld