Migrate some easy components to ES6

package.json

@@ -70,11 +70,23 @@
     "whatwg-fetch": "^3.0.0"
   },
   "babel": {
-    "presets": ["@babel/preset-env"],
+    "presets": [
-    "overrides": [{
+      "@babel/preset-env"
-        "test": ["src/components/cardbuilder/cardBuilder.js"],
+    ],
-        "plugins": ["@babel/plugin-transform-modules-amd"]
+    "overrides": [
-    }]
+      {
+        "test": [
+          "src/components/cardbuilder/cardBuilder.js",
+          "src/components/filedownloader.js",
+          "src/components/filesystem.js",
+          "src/components/input/keyboardnavigation.js",
+          "src/components/sanatizefilename.js"
+        ],
+        "plugins": [
+          "@babel/plugin-transform-modules-amd"
+        ]
+      }
+    ]
   },
   "browserslist": [
     "last 2 Firefox versions",

src/components/filedownloader.js

@@ -1,8 +1,6 @@
-define(['multi-download'], function (multiDownload) {
+import multiDownload from "multi-download"
-    'use strict';
 
-    return {
+export function download(items) {
-        download: function (items) {
 
     if (window.NativeShell) {
         items.map(function (item) {
@@ -13,6 +11,4 @@ define(['multi-download'], function (multiDownload) {
             return item.url;
         }));
     }
-        }
+}
-    };
-});

src/components/filesystem.js

@@ -1,18 +1,13 @@
-define([], function () {
+export function fileExists(path) {
-    'use strict';
-
-    return {
-        fileExists: function (path) {
     if (window.NativeShell && window.NativeShell.FileSystem) {
         return window.NativeShell.FileSystem.fileExists(path);
     }
     return Promise.reject();
-        },
+}
-        directoryExists: function (path) {
+
+export function directoryExists(path) {
     if (window.NativeShell && window.NativeShell.FileSystem) {
         return window.NativeShell.FileSystem.directoryExists(path);
     }
     return Promise.reject();
-        }
+}
-    };
-});

src/components/input/keyboardnavigation.js

@@ -1,11 +1,10 @@
-define(["inputManager", "layoutManager"], function (inputManager, layoutManager) {
+import inputManager from "inputManager";
-    "use strict";
+import layoutManager from "layoutManager";
 
-    /**
+/**
  * Key name mapping.
  */
-    // Add more to support old browsers
+const KeyNames = {
-    var KeyNames = {
     13: "Enter",
     19: "Pause",
     27: "Escape",
@@ -32,57 +31,57 @@ define(["inputManager", "layoutManager"], function (inputManager, layoutManager)
     10233: "MediaTrackNext",
     // MediaPlayPause (Tizen)
     10252: "MediaPlayPause"
-    };
+};
 
-    /**
+/**
  * Keys used for keyboard navigation.
  */
-    var NavigationKeys = ["ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown"];
+const NavigationKeys = ["ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown"];
 
-    var hasFieldKey = false;
+let hasFieldKey = false;
-    try {
+try {
     hasFieldKey = "key" in new KeyboardEvent("keydown");
-    } catch (e) {
+} catch (e) {
     console.error("error checking 'key' field");
-    }
+}
 
-    if (!hasFieldKey) {
+if (!hasFieldKey) {
     // Add [a..z]
-        for (var i = 65; i <= 90; i++) {
+    for (let i = 65; i <= 90; i++) {
         KeyNames[i] = String.fromCharCode(i).toLowerCase();
     }
-    }
+}
 
-    /**
+/**
  * Returns key name from event.
  *
-     * @param {KeyboardEvent} keyboard event
+ * @param {KeyboardEvent} event keyboard event
  * @return {string} key name
  */
-    function getKeyName(event) {
+export function getKeyName(event) {
     return KeyNames[event.keyCode] || event.key;
-    }
+}
 
-    /**
+/**
  * Returns _true_ if key is used for navigation.
  *
  * @param {string} key name
  * @return {boolean} _true_ if key is used for navigation
  */
-    function isNavigationKey(key) {
+export function isNavigationKey(key) {
     return NavigationKeys.indexOf(key) != -1;
-    }
+}
 
-    function enable() {
+export function enable() {
     document.addEventListener("keydown", function (e) {
-            var key = getKeyName(e);
+        const key = getKeyName(e);
 
         // Ignore navigation keys for non-TV
         if (!layoutManager.tv && isNavigationKey(key)) {
             return;
         }
 
-            var capture = true;
+        let capture = true;
 
         switch (key) {
             case "ArrowLeft":
@@ -144,22 +143,15 @@ define(["inputManager", "layoutManager"], function (inputManager, layoutManager)
             e.preventDefault();
         }
     });
-    }
+}
 
-    // Gamepad initialisation. No script is required if no gamepads are present at init time, saving a bit of resources.
+// Gamepad initialisation. No script is required if no gamepads are present at init time, saving a bit of resources.
-    // Whenever the gamepad is connected, we hand all the control of the gamepad to gamepadtokey.js by removing the event handler
+// Whenever the gamepad is connected, we hand all the control of the gamepad to gamepadtokey.js by removing the event handler
-    function attachGamepadScript(e) {
+function attachGamepadScript(e) {
     console.log("Gamepad connected! Attaching gamepadtokey.js script");
     window.removeEventListener("gamepadconnected", attachGamepadScript);
     require(["components/input/gamepadtokey"]);
-    }
+}
 
-    // No need to check for gamepads manually at load time, the eventhandler will be fired for that
+// No need to check for gamepads manually at load time, the eventhandler will be fired for that
-    window.addEventListener("gamepadconnected", attachGamepadScript);
+window.addEventListener("gamepadconnected", attachGamepadScript);
-
-    return {
-        enable: enable,
-        getKeyName: getKeyName,
-        isNavigationKey: isNavigationKey
-    };
-});

src/components/sanitizefilename.js

@@ -1,33 +1,30 @@
 // From https://github.com/parshap/node-sanitize-filename
 
-define([], function () {
+const illegalRe = /[\/\?<>\\:\*\|":]/g;
-    'use strict';
+// eslint-disable-next-line no-control-regex
+const controlRe = /[\x00-\x1f\x80-\x9f]/g;
+const reservedRe = /^\.+$/;
+const windowsReservedRe = /^(con|prn|aux|nul|com[0-9]|lpt[0-9])(\..*)?$/i;
+const windowsTrailingRe = /[\. ]+$/;
 
-    var illegalRe = /[\/\?<>\\:\*\|":]/g;
+function isHighSurrogate(codePoint) {
-    // eslint-disable-next-line no-control-regex
-    var controlRe = /[\x00-\x1f\x80-\x9f]/g;
-    var reservedRe = /^\.+$/;
-    var windowsReservedRe = /^(con|prn|aux|nul|com[0-9]|lpt[0-9])(\..*)?$/i;
-    var windowsTrailingRe = /[\. ]+$/;
-
-    function isHighSurrogate(codePoint) {
     return codePoint >= 0xd800 && codePoint <= 0xdbff;
-    }
+}
 
-    function isLowSurrogate(codePoint) {
+function isLowSurrogate(codePoint) {
     return codePoint >= 0xdc00 && codePoint <= 0xdfff;
-    }
+}
 
-    function getByteLength(string) {
+function getByteLength(string) {
     if (typeof string !== "string") {
         throw new Error("Input must be string");
     }
 
-        var charLength = string.length;
+    const charLength = string.length;
-        var byteLength = 0;
+    let byteLength = 0;
-        var codePoint = null;
+    let codePoint = null;
-        var prevCodePoint = null;
+    let prevCodePoint = null;
-        for (var i = 0; i < charLength; i++) {
+    for (let i = 0; i < charLength; i++) {
         codePoint = string.charCodeAt(i);
         // handle 4-byte non-BMP chars
         // low surrogate
@@ -49,19 +46,19 @@ define([], function () {
     }
 
     return byteLength;
-    }
+}
 
-    function truncate(string, byteLength) {
+function truncate(string, byteLength) {
     if (typeof string !== "string") {
         throw new Error("Input must be string");
     }
 
-        var charLength = string.length;
+    const charLength = string.length;
-        var curByteLength = 0;
+    let curByteLength = 0;
-        var codePoint;
+    let codePoint;
-        var segment;
+    let segment;
 
-        for (var i = 0; i < charLength; i += 1) {
+    for (let i = 0; i < charLength; i += 1) {
         codePoint = string.charCodeAt(i);
         segment = string[i];
 
@@ -80,17 +77,14 @@ define([], function () {
     }
 
     return string;
-    }
+}
 
-    return {
+export function sanitize(input, replacement) {
-        sanitize: function (input, replacement) {
+    const sanitized = input
-            var sanitized = input
         .replace(illegalRe, replacement)
         .replace(controlRe, replacement)
         .replace(reservedRe, replacement)
         .replace(windowsReservedRe, replacement)
         .replace(windowsTrailingRe, replacement);
     return truncate(sanitized, 255);
-        }
+}
-    };
-});