Merge branch 'fix/common-controller-scripts-es7' into temp/traktorS4m…

…k3mapping

.eslintrc.json

@@ -1,7 +1,6 @@
 {
   "extends": [ "eslint:recommended",
-               "plugin:jsdoc/recommended",
-               "plugin:@typescript-eslint/recommended" ],
+               "plugin:jsdoc/recommended"],
 
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
@@ -99,6 +98,7 @@
   "overrides": [
    {
        "files": [ "res/controllers/*.d.ts" ],
+       "extends": [ "plugin:@typescript-eslint/recommended" ],
        "rules": {
          "no-unused-vars": "off"
        }

res/controllers/common-controller-scripts.js

@@ -36,6 +36,7 @@ String.prototype.toInt = function() {
  * @param {string} message - The log message.
  * @deprecated Use console.log()/console.warn()/console.debug() instead.
  */
+
 var print = function(message) {
     console.log(message);
 };
@@ -45,6 +46,7 @@ var printObject = function(obj, maxdepth) {
     print(stringifyObject(obj, maxdepth));
 };
 
+
 var stringifyObject = function(obj, maxdepth, checked, prefix) {
     if (!maxdepth) { maxdepth = 2; }
     try {
@@ -69,6 +71,7 @@ var stringifyObject = function(obj, maxdepth, checked, prefix) {
     return obj;
 };
 
+
 var arrayContains = function(array, elem) {
     for (let i = 0; i < array.length; i++) {
         if (array[i] === elem) { return true; }
@@ -491,6 +494,7 @@ script.softStart = function(channel, control, value, status, group, factor) {
 };
 
 // bpm - Used for tapping the desired BPM for a deck
+
 var bpm = function() {
 };
 
@@ -565,11 +569,13 @@ script.individualEffectRegEx = /^\[EffectRack1_EffectUnit(\d+)_Effect(\d+)\]$/;
 // ----------------- Object definitions --------------------------
 
 
+
 var ButtonState = {"released": 0x00, "pressed": 0x7F};
 // eslint-disable-next-line no-unused-vars
 var LedState = {"off": 0x00, "on": 0x7F};
 
 // Controller
+
 var Controller = function() {
     this.group = "[Master]";
     this.Controls = [];
@@ -593,6 +599,7 @@ Controller.prototype.setControlValue = function(control, value) {
 };
 
 // Button
+
 var Button = function(controlId) {
     this.controlId = controlId;
     this.state = ButtonState.released;
@@ -602,6 +609,7 @@ Button.prototype.handleEvent = function(value) {
 };
 
 // Control
+
 var Control = function(mappedFunction, softMode) {
     // These defaults are for MIDI controllers
     this.minInput = 0;
@@ -650,6 +658,7 @@ Control.prototype.setValue = function(group, inputValue) {
 };
 
 // Deck
+
 var Deck = function(deckNumber, group) {
     this.deckNumber = deckNumber;
     this.group = group;