OLD | NEW |
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.ActiveFilter = ActiveFilter; |
21 this.RegExpFilter = RegExpFilter; | 22 this.RegExpFilter = RegExpFilter; |
22 this.BlockingFilter = BlockingFilter; | 23 this.BlockingFilter = BlockingFilter; |
23 this.WhitelistFilter = WhitelistFilter; | 24 this.WhitelistFilter = WhitelistFilter; |
24 } | 25 } |
25 with(require("subscriptionClasses")) | 26 with(require("subscriptionClasses")) |
26 { | 27 { |
27 this.Subscription = Subscription; | 28 this.Subscription = Subscription; |
28 this.DownloadableSubscription = DownloadableSubscription; | 29 this.DownloadableSubscription = DownloadableSubscription; |
29 } | 30 } |
30 with(require("whitelisting")) | 31 with(require("whitelisting")) |
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
584 tab.sendMessage({type: "clickhide-deactivate"}); | 585 tab.sendMessage({type: "clickhide-deactivate"}); |
585 refreshIconAndContextMenu(tab); | 586 refreshIconAndContextMenu(tab); |
586 }); | 587 }); |
587 | 588 |
588 setTimeout(function() | 589 setTimeout(function() |
589 { | 590 { |
590 var notificationToShow = Notification.getNextToShow(); | 591 var notificationToShow = Notification.getNextToShow(); |
591 if (notificationToShow) | 592 if (notificationToShow) |
592 showNotification(notificationToShow); | 593 showNotification(notificationToShow); |
593 }, 3 * 60 * 1000); | 594 }, 3 * 60 * 1000); |
OLD | NEW |