Issue 4871 - Start using ESLint for adblockplusui

lib/antiadblockInit.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* globals Cu */
-
 "use strict";
 
-Cu.import("resource://gre/modules/Services.jsm");
+const {Prefs} = require("prefs");
+const {ActiveFilter} = require("filterClasses");
+const {FilterStorage} = require("filterStorage");
+const {FilterNotifier} = require("filterNotifier");
+const {Subscription} = require("subscriptionClasses");
+const {Notification} = require("notification");
 
-let {Utils} = require("utils");
-let {Prefs} = require("prefs");
-let {ActiveFilter} = require("filterClasses");
-let {FilterStorage} = require("filterStorage");
-let {FilterNotifier} = require("filterNotifier");
-let {Subscription} = require("subscriptionClasses");
-let {Notification} = require("notification");
+let ext;
+if (typeof window != "undefined" && window.ext)
+  ({ext} = window);
+else
+  ext = require("ext_background");
 
 exports.initAntiAdblockNotification = function initAntiAdblockNotification()
 {
   let notification = {
     id: "antiadblock",
     type: "question",
     title: ext.i18n.getMessage("notification_antiadblock_title"),
     message: ext.i18n.getMessage("notification_antiadblock_message"),
     urlFilters: []
   };
@@ skipping 25 matching lines @@
     Notification.addNotification(notification);
     Notification.addQuestionListener(notification.id, notificationListener);
   }
 
   function removeAntiAdblockNotification()
   {
     Notification.removeNotification(notification);
     Notification.removeQuestionListener(notification.id, notificationListener);
   }
 
-  {

[Thomas Greiner, 2017/03/01 17:39:35]

I assume this is necessary due to the "no-shadow" rule but it's pretty
non-intuitive nevertheless because it looks like we do this because
`subscription` is being redeclared here.

Therefore it'd be great if we could handle this conflict in a clearer way.

[kzar, 2017/03/07 12:48:32]

Done.

-    let subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl);
-    if (subscription.lastDownload && subscription.disabled)
-      addAntiAdblockNotification(subscription);
-  }
+  let antiAdblockSubscription = Subscription.fromURL(
+    Prefs.subscriptions_antiadblockurl
+  );
+  if (antiAdblockSubscription.lastDownload && antiAdblockSubscription.disabled)
+    addAntiAdblockNotification(antiAdblockSubscription);
 
   function onSubscriptionChange(subscription)
   {
     let url = Prefs.subscriptions_antiadblockurl;
     if (url != subscription.url)
       return;
 
     if (url in FilterStorage.knownSubscriptions && !subscription.disabled)
       addAntiAdblockNotification(subscription);
     else
       removeAntiAdblockNotification();
   }
 
   FilterNotifier.on("subscription.updated", onSubscriptionChange);
   FilterNotifier.on("subscription.removed", onSubscriptionChange);
   FilterNotifier.on("subscription.disabled", onSubscriptionChange);
 };