| Index: lib/antiadblockInit.js |
| diff --git a/lib/antiadblockInit.js b/lib/antiadblockInit.js |
| index e48039e27a250ecdc9c46c771c7a927e532b47a0..e6154f3ab171c49996121319796b783250cd2851 100644 |
| --- a/lib/antiadblockInit.js |
| +++ b/lib/antiadblockInit.js |
| @@ -15,19 +15,18 @@ |
| * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| */ |
| -Cu.import("resource://gre/modules/Services.jsm"); |
| +"use strict"; |
| -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"); |
| +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 ext; |
| if (typeof window != "undefined" && window.ext) |
| - ext = window.ext; |
| + ({ext} = window); |
| else |
| ext = require("ext_background"); |
| @@ -58,7 +57,8 @@ exports.initAntiAdblockNotification = function initAntiAdblockNotification() |
| for (let domain in filter.domains) |
| { |
| let urlFilter = "||" + domain + "^$document"; |
| - if (domain && filter.domains[domain] && urlFilters.indexOf(urlFilter) == -1) |
| + if (domain && filter.domains[domain] && |
| + urlFilters.indexOf(urlFilter) == -1) |
| urlFilters.push(urlFilter); |
| } |
| } |
| @@ -74,9 +74,11 @@ exports.initAntiAdblockNotification = function initAntiAdblockNotification() |
| Notification.removeQuestionListener(notification.id, notificationListener); |
| } |
| - 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) |
| { |
| @@ -93,4 +95,4 @@ exports.initAntiAdblockNotification = function initAntiAdblockNotification() |
| FilterNotifier.on("subscription.updated", onSubscriptionChange); |
| FilterNotifier.on("subscription.removed", onSubscriptionChange); |
| FilterNotifier.on("subscription.disabled", onSubscriptionChange); |
| -} |
| +}; |