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

Side by Side Diff: background.js

Issue 5118635873927168: Added missing import for filterClasses.ActiveFilter to the background page (Closed)
Patch Set: Added comment to remove that line again Created April 9, 2014, 10:23 a.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 <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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 with(require("filterClasses")) 18 with(require("filterClasses"))
19 { 19 {
20 this.Filter = Filter; 20 this.Filter = Filter;
21 this.RegExpFilter = RegExpFilter; 21 this.RegExpFilter = RegExpFilter;
22 this.BlockingFilter = BlockingFilter; 22 this.BlockingFilter = BlockingFilter;
23 this.WhitelistFilter = WhitelistFilter; 23 this.WhitelistFilter = WhitelistFilter;
24
25 // TODO: The import below isn't necessary anymore with
26 // https://hg.adblockplus.org/adblockplus/rev/7eb29729a72c
27 // However due to https://issues.adblockplus.org/ticket/189
28 // we can't update the subrepo yet. So please remove this
29 // line when the issue was fixed and the subrepo was updated.
30 this.ActiveFilter = ActiveFilter;
24 } 31 }
25 with(require("subscriptionClasses")) 32 with(require("subscriptionClasses"))
26 { 33 {
27 this.Subscription = Subscription; 34 this.Subscription = Subscription;
28 this.DownloadableSubscription = DownloadableSubscription; 35 this.DownloadableSubscription = DownloadableSubscription;
29 } 36 }
30 with(require("whitelisting")) 37 with(require("whitelisting"))
31 { 38 {
32 this.isWhitelisted = isWhitelisted; 39 this.isWhitelisted = isWhitelisted;
33 this.isFrameWhitelisted = isFrameWhitelisted; 40 this.isFrameWhitelisted = isFrameWhitelisted;
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 tab.sendMessage({type: "clickhide-deactivate"}); 591 tab.sendMessage({type: "clickhide-deactivate"});
585 refreshIconAndContextMenu(tab); 592 refreshIconAndContextMenu(tab);
586 }); 593 });
587 594
588 setTimeout(function() 595 setTimeout(function()
589 { 596 {
590 var notificationToShow = Notification.getNextToShow(); 597 var notificationToShow = Notification.getNextToShow();
591 if (notificationToShow) 598 if (notificationToShow)
592 showNotification(notificationToShow); 599 showNotification(notificationToShow);
593 }, 3 * 60 * 1000); 600 }, 3 * 60 * 1000);
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