Issue 4795 - Use modern JavaScript syntax

popup.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/>.
  */
 
 "use strict";
 
-let backgroundPage = ext.backgroundPage.getWindow();
-let require = backgroundPage.require;
+const {require} = ext.backgroundPage.getWindow();
 
-let Filter = require("filterClasses").Filter;

[Sebastian Noack, 2017/01/16 15:35:56]

I suppose we could better use destructuring here now?

[kzar, 2017/01/17 07:42:49]

Done.

-let FilterStorage = require("filterStorage").FilterStorage;
-let Prefs = require("prefs").Prefs;
-let checkWhitelisted = require("whitelisting").checkWhitelisted;
-let getDecodedHostname = require("url").getDecodedHostname;
+const {Filter} = require("filterClasses");
+const {FilterStorage} = require("filterStorage");
+const {Prefs} = require("prefs");
+const {checkWhitelisted} = require("whitelisting");
+const {getDecodedHostname} = require("url");
 
 let page = null;
 
 function onLoad()
 {
   ext.pages.query({active: true, lastFocusedWindow: true}, pages =>
   {
     page = pages[0];
 
     // Mark page as 'local' or 'nohtml' to hide non-relevant elements
@@ skipping 96 matching lines @@
 }
 
 function toggleCollapse(event)
 {
   let collapser = event.currentTarget;
   Prefs[collapser.dataset.option] = !Prefs[collapser.dataset.option];
   collapser.parentNode.classList.toggle("collapsed");
 }
 
 document.addEventListener("DOMContentLoaded", onLoad, false);