Issue 4795 - Use modern JavaScript syntax

qunit/tests/cssEscaping.js

-(function()
+"use strict";
+
 {
-  var filterClasses = require("filterClasses");
-  var Filter = filterClasses.Filter;
-  var ElemHideFilter = filterClasses.ElemHideFilter;
+  let filterClasses = require("filterClasses");

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

I suppose we could better use destructuring here now?

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

Done.

+  let Filter = filterClasses.Filter;
+  let ElemHideFilter = filterClasses.ElemHideFilter;
 
-  var filterComposer = require("filterComposer");
-  var escapeCSS = filterComposer.escapeCSS;
-  var quoteCSS = filterComposer.quoteCSS;
+  let filterComposer = require("filterComposer");
+  let escapeCSS = filterComposer.escapeCSS;
+  let quoteCSS = filterComposer.quoteCSS;
 
   module("CSS escaping");
 
-  test("CSS escaping", function()
+  test("CSS escaping", () =>
   {
     function testSelector(opts)
     {
-      var mustMatch = opts.mustMatch !== false;
-      var doc = document.implementation.createHTMLDocument();
+      let mustMatch = opts.mustMatch !== false;
+      let doc = document.implementation.createHTMLDocument();
 
-      var style = doc.createElement("style");
+      let style = doc.createElement("style");
       doc.documentElement.appendChild(style);
       style.sheet.insertRule(opts.selector + " {}", 0);
 
-      var element;
+      let element;
       try
       {
         element = doc.createElement(opts.tagName || "div");
       }
       catch (e)
       {
         // Some characters we are going to test can not occur in tag names,
         // but we still have to make sure that no exception is thrown when
         // calling .querySelector() and .insertRule()
         element = null;
         mustMatch = false;
       }
 
       if (element)
       {
-        for (var attr in opts.attributes)
+        for (let attr in opts.attributes)
           element.setAttribute(attr, opts.attributes[attr]);
 
         doc.documentElement.appendChild(element);
       }
 
-      var foundElement = doc.querySelector(opts.selector);
-      var filter = Filter.fromText("##" + opts.selector);
+      let foundElement = doc.querySelector(opts.selector);
+      let filter = Filter.fromText("##" + opts.selector);
 
       if (!(filter instanceof ElemHideFilter))
       {
         ok(false, opts.selector + " (not allowed in elemhide filters)");
       }
       else
       {
         if (mustMatch)
           equal(foundElement, element, opts.selector);
         else
@@ skipping 22 matching lines @@
         // is thrown when calling .querySelector() and .insertRule()
         mustMatch: !/\s/.test(s)
       });
 
       testSelector({
         selector: "[foo=" + quoteCSS(s) + "]",
         attributes: {foo: s}
       });
     }
 
-    for (var i = 1; i < 0x80; i++)
+    for (let i = 1; i < 0x80; i++)
     {
-      var chr = String.fromCharCode(i);
+      let chr = String.fromCharCode(i);
 
       // Make sure that all ASCII characters are correctly escaped.
       testEscape(chr);
 
       // Some characters are only escaped when in the first positon,
       // so we still have to make sure that everything is correctly escaped
       // in subsequent positions.
       testEscape("x" + chr);
 
       // Leading dashes must be escaped, when followed by certain characters.
       testEscape("-" + chr);
     }
 
     // Test some non-ASCII characters. However, those shouldn't require escaping.
     testEscape("\uD83D\uDE3B\u2665\u00E4");
   });
-})();
+}