Issue 4657 - Add Acceptable Ads API

lib/api.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2016 Eyeo GmbH
+ * Copyright (C) 2006-2017 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
@@ skipping 130 matching lines @@
 
     setAASubscriptionEnabled: function(enabled)
     {
       var aaSubscription = FilterStorage.subscriptions.find(API.isAASubscription);
       if (!enabled)
       {
         if (aaSubscription && !aaSubscription.disabled)
           aaSubscription.disabled = true;
         return;
       }
-      if (!aaSubscription) {

[hub, 2017/03/17 20:04:15]

'nit: new line before the {

[sergei, 2017/03/17 22:10:06]

Done.

+      if (!aaSubscription)
+      {
         aaSubscription = Subscription.fromURL(Prefs.subscriptions_exceptionsurl);
         FilterStorage.addSubscription(aaSubscription);
       }
       if (aaSubscription.disabled)
         aaSubscription.disabled = false;
       if (!aaSubscription.lastDownload)
         Synchronizer.execute(aaSubscription);
     },
 
     isAASubscriptionEnabled: function()
@@ skipping 34 matching lines @@
       return Prefs[pref];
     },
 
     setPref: function(pref, value)
     {
       Prefs[pref] = value;
     },
 
     forceUpdateCheck: function(eventName)
     {
-      checkForUpdates(_triggerEvent.bind(null, eventName));
+      checkForUpdates(eventName ? _triggerEvent.bind(null, eventName) : null);
     },
 
     getHostFromUrl: function(url)
     {
       return extractHostFromURL(url);
     },
 
     compareVersions: function(v1, v2)
     {
       return Services.vc.compare(v1, v2);
     }
   };
 })();