Issue 4795 - Use modern JavaScript syntax

utils.js

Index: utils.js
diff --git a/utils.js b/utils.js
index 64b7274494c869713ebf1b051036859f5677823f..e048f37e6f77c1bb8498741ceb60a1617afc6bca 100644
--- a/utils.js
+++ b/utils.js
@@ -1,20 +1,17 @@
-var backgroundPage = ext.backgroundPage.getWindow();
-var require = backgroundPage.require;
+"use strict";
 
-var Services = backgroundPage.Services;
-var Synchronizer = require("synchronizer").Synchronizer;
-var Utils = require("utils").Utils;
-var Prefs = require("prefs").Prefs;
-var FilterStorage = require("filterStorage").FilterStorage;
-var FilterNotifier = require("filterNotifier").FilterNotifier;
+const backgroundPage = ext.backgroundPage.getWindow();
+const {require, Services} = backgroundPage;

[Sebastian Noack, 2017/01/18 11:24:30]

Note that backgroundPage isn't used anywhere else, so how about this:

  const {require, Services} = ext.backgroundPage.getWindow();

[kzar, 2017/01/18 11:46:41]

Done.

 
-var subscriptionClasses = require("subscriptionClasses");
-var Subscription = subscriptionClasses.Subscription;
-var DownloadableSubscription = subscriptionClasses.DownloadableSubscription;
-var filterClasses = require("filterClasses");
-var Filter = filterClasses.Filter;
-var BlockingFilter = filterClasses.BlockingFilter;
-var defaultMatcher = require("matcher").defaultMatcher;
+const {Synchronizer} = require("synchronizer");
+const {Utils} = require("utils");
+const {Prefs} = require("prefs");
+const {FilterStorage} = require("filterStorage");
+const {FilterNotifier} = require("filterNotifier");
+
+const {Subscription, DownloadableSubscription} = require("subscriptionClasses");
+const {Filter, BlockingFilter} = require("filterClasses");
+const {defaultMatcher} = require("matcher");
 
 /**
  * Shortcut for document.getElementById(id)