Issue 417 - Reinitializing removed filter lists (Core/Firefox)

chrome/content/ui/firstRun.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 38 matching lines @@
     // Set up URLs
     var donateLink = E("donate");
     donateLink.href = Utils.getDocLink("donate");
 
     var contributors = E("contributors");
     contributors.href = Utils.getDocLink("contributors");
 
     setLinks("acceptableAdsExplanation", Utils.getDocLink("acceptable_ads_criteria"), openFilters);
     setLinks("share-headline", Utils.getDocLink("contribute"));
 
-    // Show warning if data corruption was detected
-    if (typeof backgroundPage != "undefined" && backgroundPage.seenDataCorruption)
-    {
-      E("dataCorruptionWarning").removeAttribute("hidden");
-      setLinks("dataCorruptionWarning", Utils.getDocLink("knownIssuesChrome_filterstorage"));
-    }
-
-    // Show warning if filterlists settings were reinitialized
-    var filterlistsReinitialized = false;
     if (typeof backgroundPage != "undefined")
-      filterlistsReinitialized = backgroundPage.filterlistsReinitialized;
-    else
-    {
-      var UI = require("ui").UI;
-      filterlistsReinitialized = (typeof UI != "undefined" && UI.filterlistsReinitialized);
-    }
-    if (filterlistsReinitialized)
-    {
-      E("filterlistsReinitializedWarning").removeAttribute("hidden");
-      setLinks("filterlistsReinitializedWarning", openFilters);
+    {
+      // Show warning if data corruption was detected
+      if (backgroundPage.seenDataCorruption)
+      {
+        E("dataCorruptionWarning").removeAttribute("hidden");
+        setLinks("dataCorruptionWarning", Utils.getDocLink("knownIssuesChrome_filterstorage"));
+      }
+
+      // Show warning if filterlists settings were reinitialized
+      if (backgroundPage.filterlistsReinitialized)
+      {
+        E("filterlistsReinitializedWarning").removeAttribute("hidden");
+        setLinks("filterlistsReinitializedWarning", openFilters);
+      }
     }
 
     // Show warning if Safari version isn't supported
     var info = require("info");
     if (info.platform == "safari" && (
       Services.vc.compare(info.platformVersion, "6.0")  < 0 ||  // beforeload breaks websites in Safari 5
       Services.vc.compare(info.platformVersion, "6.1") == 0 ||  // extensions are broken in 6.1 and 7.0
       Services.vc.compare(info.platformVersion, "7.0") == 0
     ))
       E("legacySafariWarning").removeAttribute("hidden");
@@ skipping 160 matching lines @@
   {
     var button = E("toggle-" + feature);
     if (isEnabled)
       button.classList.remove("off");
     else
       button.classList.add("off");
   }
 
   document.addEventListener("DOMContentLoaded", onDOMLoaded, false);
 })();