Index: lib/filterListener.js
===================================================================
--- a/lib/filterListener.js
+++ b/lib/filterListener.js
@@ -1,8 +1,9 @@
+/* globals XPCOM, XPCOMUtils, Services */
/*
* This file is part of Adblock Plus ,
* 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.
*
@@ -17,18 +18,18 @@
"use strict";
/**
* @fileOverview Component synchronizing filter storage with Matcher
* instances and ElemHide.
*/
-const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
-const {XPCOMUtils} = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
const {FilterStorage} = require("filterStorage");
const {FilterNotifier} = require("filterNotifier");
const {ElemHide} = require("elemHide");
const {ElemHideEmulation} = require("elemHideEmulation");
const {defaultMatcher} = require("matcher");
const {ActiveFilter, RegExpFilter,
ElemHideBase, ElemHideEmulationFilter} = require("filterClasses");
Index: lib/filterStorage.js
===================================================================
--- a/lib/filterStorage.js
+++ b/lib/filterStorage.js
@@ -1,8 +1,9 @@
+/* global Services, FileUtils */
/*
* This file is part of Adblock Plus ,
* 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.
*
@@ -17,18 +18,18 @@
"use strict";
/**
* @fileOverview FilterStorage class responsible for managing user's
* subscriptions and filters.
*/
-const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", {});
-const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
+Cu.import("resource://gre/modules/FileUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
const {IO} = require("io");
const {Prefs} = require("prefs");
const {Filter, ActiveFilter} = require("filterClasses");
const {Subscription, SpecialSubscription,
ExternalSubscription} = require("subscriptionClasses");
const {FilterNotifier} = require("filterNotifier");
const {Utils} = require("utils");
Index: lib/notification.js
===================================================================
--- a/lib/notification.js
+++ b/lib/notification.js
@@ -1,8 +1,9 @@
+/* global Services */
/*
* This file is part of Adblock Plus ,
* 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.
*
@@ -16,17 +17,17 @@
*/
"use strict";
/**
* @fileOverview Handles notifications.
*/
-const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
+Cu.import("resource://gre/modules/Services.jsm");
const {Prefs} = require("prefs");
const {Downloader, Downloadable,
MILLIS_IN_MINUTE, MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader");
const {Utils} = require("utils");
const {Matcher, defaultMatcher} = require("matcher");
const {Filter, RegExpFilter, WhitelistFilter} = require("filterClasses");