OLD | NEW |
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-2015 Eyeo GmbH | 3 * Copyright (C) 2006-2015 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 14 matching lines...) Expand all Loading... |
25 Cu.import("resource://gre/modules/Services.jsm"); | 25 Cu.import("resource://gre/modules/Services.jsm"); |
26 | 26 |
27 function require(module) | 27 function require(module) |
28 { | 28 { |
29 let result = {}; | 29 let result = {}; |
30 result.wrappedJSObject = result; | 30 result.wrappedJSObject = result; |
31 Services.obs.notifyObservers(result, "adblockplus-require", module); | 31 Services.obs.notifyObservers(result, "adblockplus-require", module); |
32 return result.exports; | 32 return result.exports; |
33 } | 33 } |
34 | 34 |
| 35 let {FilterNotifier} = require("filterNotifier"); |
35 let {FilterStorage} = require("filterStorage"); | 36 let {FilterStorage} = require("filterStorage"); |
36 let {Prefs} = require("prefs"); | 37 let {Prefs} = require("prefs"); |
37 let {UI} = require("ui"); | 38 let {UI} = require("ui"); |
38 | 39 |
| 40 let filtersLoaded = false; |
| 41 |
39 var AdblockPlusApi = | 42 var AdblockPlusApi = |
40 { | 43 { |
| 44 get filtersLoaded() |
| 45 { |
| 46 return filtersLoaded; |
| 47 }, |
| 48 filterLoadListener: null, |
41 get acceptableAdsEnabled() | 49 get acceptableAdsEnabled() |
42 { | 50 { |
43 return FilterStorage.subscriptions.some( | 51 return FilterStorage.subscriptions.some( |
44 (subscription) => subscription.url == Prefs.subscriptions_exceptionsurl); | 52 (subscription) => subscription.url == Prefs.subscriptions_exceptionsurl); |
45 }, | 53 }, |
46 set acceptableAdsEnabled(acceptableAdsEnabled) | 54 set acceptableAdsEnabled(acceptableAdsEnabled) |
47 { | 55 { |
48 if (acceptableAdsEnabled != AdblockPlusApi.acceptableAdsEnabled) | 56 if (acceptableAdsEnabled != AdblockPlusApi.acceptableAdsEnabled) |
49 UI.toggleAcceptableAds(); | 57 UI.toggleAcceptableAds(); |
50 } | 58 } |
51 }; | 59 }; |
| 60 |
| 61 FilterNotifier.addListener(function(action) |
| 62 { |
| 63 if (action != "load") |
| 64 return; |
| 65 |
| 66 filtersLoaded = true; |
| 67 if (typeof AdblockPlusApi.filterLoadListener == "function") |
| 68 { |
| 69 AdblockPlusApi.filterLoadListener(); |
| 70 AdblockPlusApi.filterLoadListener = null; |
| 71 } |
| 72 }); |
OLD | NEW |