Issue 3515 - Replace Prefs.onLoaded event by Prefs.isLoaded promise

background.js

 /*
  * 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 41 matching lines @@
 var composeFilters = require("filterComposer").composeFilters;
 var updateIcon = require("icon").updateIcon;
 var initNotifications = require("notificationHelper").initNotifications;
 var showNextNotificationForUrl = require("notificationHelper").showNextNotificationForUrl;
 
 var seenDataCorruption = false;
 var filterlistsReinitialized = false;
 
 function init()
 {
-  var filtersLoaded = false;
-  var prefsLoaded = false;
+  var filtersLoaded = new Promise(function(resolve)
+  {
+    function onFilterAction(action)
+    {
+      if (action == "load")
+      {
+        FilterNotifier.removeListener(onFilterAction);
+        resolve();
+      }
+    }
+    FilterNotifier.addListener(onFilterAction);
+  });
 
-  var checkLoaded = function()
+  function onLoaded()
   {
-    if (!filtersLoaded || !prefsLoaded)
-      return;
-
     var info = require("info");
     var previousVersion = Prefs.currentVersion;
 
     // There are no filters stored so we need to reinitialize all filterlists
     if (!FilterStorage.firstRun && FilterStorage.subscriptions.length === 0)
     {
       filterlistsReinitialized = true;
       previousVersion = null;
     }
 
     if (previousVersion != info.addonVersion || FilterStorage.firstRun)
     {
       seenDataCorruption = previousVersion && FilterStorage.firstRun;
       Prefs.currentVersion = info.addonVersion;
       addSubscription(previousVersion);
     }
 
     initNotifications();
 
     // Update browser actions and context menus when whitelisting might have
     // changed. That is now when initally loading the filters and later when
     // importing backups or saving filter changes.
     FilterNotifier.addListener(function(action)
     {
       if (action == "load" || action == "save")
         refreshIconAndContextMenuForAllPages();
     });
     refreshIconAndContextMenuForAllPages();
-  };
+  }
 
-  var onFilterAction = function(action)
-  {
-    if (action == "load")
-    {
-      FilterNotifier.removeListener(onFilterAction);
-      filtersLoaded = true;
-      checkLoaded();
-    }
-  };
-
-  var onPrefsLoaded = function()
-  {
-    Prefs.onLoaded.removeListener(onPrefsLoaded);
-    prefsLoaded = true;
-    checkLoaded();
-  };
-
-  FilterNotifier.addListener(onFilterAction);
-  Prefs.onLoaded.addListener(onPrefsLoaded);
+  Promise.all([filtersLoaded, Prefs.isLoaded]).then(onLoaded);
 }
 init();
 
 // Special-case domains for which we cannot use style-based hiding rules.
 // See http://crbug.com/68705.
 var noStyleRulesHosts = ["mail.google.com", "mail.yahoo.com", "www.google.com"];
 
 var htmlPages = new ext.PageMap();
 
 var contextMenuItem = {
@@ skipping 298 matching lines @@
   }
 });
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
   showNextNotificationForUrl(page.url);
 });