Add filtersLoaded and filterLoadListener to AdblockPlusApi

adblockplus/Api.jsm

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 19 matching lines @@
   result.wrappedJSObject = result;
   Services.obs.notifyObservers(result, "adblockplus-require", module);
   return result.exports;
 }
 
 let {FilterNotifier} = require("filterNotifier");
 let {FilterStorage} = require("filterStorage");
 let {Prefs} = require("prefs");
 let {UI} = require("ui");
 
-let filtersLoaded = false;
-
 var AdblockPlusApi =
 {
   get filtersLoaded()
   {
-    return filtersLoaded;
+    return !FilterStorage._loading;
   },
   filterLoadListener: null,
   get acceptableAdsEnabled()
   {
     return FilterStorage.subscriptions.some(
       (subscription) => subscription.url == Prefs.subscriptions_exceptionsurl);
   },
   set acceptableAdsEnabled(acceptableAdsEnabled)
   {
     if (acceptableAdsEnabled != AdblockPlusApi.acceptableAdsEnabled)
       UI.toggleAcceptableAds();
   }
 };
 
-FilterNotifier.addListener(function(action)
+FilterNotifier.addListener(function filterListener(action)

[René Jeschke, 2015/03/22 21:01:46]

Oh, and from my side: we do not even really need this listener, anyway. I really
only need 'get filtersLoaded()' above.

[Felix Dahlke, 2015/03/22 21:13:28]

Right, we _can't_ use it there, actually - interaction between Java and JS is
worse than I thought.

In the spirit of not adding unused code, I'll close this review. René can add
the filtersLoaded getter above (as it is there) to his patch.

 {
   if (action != "load")
     return;
 
-  filtersLoaded = true;
+  FilterNotifier.removeListener(filterListener);
   if (typeof AdblockPlusApi.filterLoadListener == "function")
-  {
     AdblockPlusApi.filterLoadListener();
-    AdblockPlusApi.filterLoadListener = null;
-  }
 });