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

Delta Between Two Patch Sets: background.js

Issue 5464830253203456: Refactored the abstraction layer to address prerendered pages on Safari caused by leaky abstraction (Closed)
Left Patch Set: Rebased and addressed comments Created April 7, 2014, 1:14 p.m.
Right Patch Set: Addressed comments Created April 11, 2014, 2:47 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | chrome/ext/background.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 page.sendMessage({type: "clickhide-deactivate"}); 578 page.sendMessage({type: "clickhide-deactivate"});
572 refreshIconAndContextMenu(page); 579 refreshIconAndContextMenu(page);
573 }); 580 });
574 581
575 setTimeout(function() 582 setTimeout(function()
576 { 583 {
577 var notificationToShow = Notification.getNextToShow(); 584 var notificationToShow = Notification.getNextToShow();
578 if (notificationToShow) 585 if (notificationToShow)
579 showNotification(notificationToShow); 586 showNotification(notificationToShow);
580 }, 3 * 60 * 1000); 587 }, 3 * 60 * 1000);
LEFTRIGHT

Powered by Google App Engine
This is Rietveld