Fix code style issues in Numark Party Mix controller mapping

Author: rrrapha

res/controllers/Numark-Party-Mix.midi.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<MixxxMIDIPreset schemaVersion="1" mixxxVersion="2.3.3">
+<MixxxControllerPreset schemaVersion="1" mixxxVersion="2.3.3">
   <info>
     <name>Numark Party Mix</name>
     <!-- inspired by https://github.com/mixxxdj/mixxx/blob/main/res/controllers/Numark%20Mixtrack%20Pro%20FX.midi.xml -->
@@ -10,7 +10,6 @@
   </info>
   <controller id="Numark Party Mix">
     <scriptfiles>
-      <file functionprefix="" filename="lodash.mixxx.js" />
       <file functionprefix="" filename="midi-components-0.0.js" />
       <file filename="Numark-Party-Mix.scripts.js" functionprefix="NumarkPartyMix" />
     </scriptfiles>
@@ -22,7 +21,7 @@
         <status>0xBF</status>
         <midino>0x0A</midino>
         <options>
-          <Normal />
+          <normal />
         </options>
       </control>
       <control>
@@ -31,7 +30,7 @@
         <status>0xBF</status>
         <midino>0x0D</midino>
         <options>
-          <Normal />
+          <normal />
         </options>
       </control>
       <control>
@@ -40,7 +39,7 @@
         <status>0xBF</status>
         <midino>0x0C</midino>
         <options>
-          <Normal />
+          <normal />
         </options>
       </control>
       <control>
@@ -49,7 +48,7 @@
         <status>0xBF</status>
         <midino>0x08</midino>
         <options>
-          <Normal />
+          <normal />
         </options>
       </control>
       <!-- PFL buttons (press) -->
@@ -566,7 +565,7 @@
         <status>0xBF</status>
         <midino>0x00</midino>
         <options>
-          <Script-Binding />
+          <script-binding />
         </options>
       </control>
       <control>
@@ -608,4 +607,4 @@
       </control>
     </controls>
   </controller>
-</MixxxMIDIPreset>
+</MixxxControllerPreset>

res/controllers/Numark-Party-Mix.scripts.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-var
 var NumarkPartyMix = {};
 
 // The jogwheel is behaving inconsistently
@@ -51,7 +52,7 @@ NumarkPartyMix.init = function(_id, _debugging) {
         engine.setValue("[App]", "num_samplers", 8);
     }
     NumarkPartyMix.deck = new components.ComponentContainer();
-    for (var i = 0; i < 2; i++) {
+    for (let i = 0; i < 2; i++) {
         NumarkPartyMix.deck[i] = new NumarkPartyMix.Deck(i + 1);
     }
 
@@ -69,8 +70,8 @@ NumarkPartyMix.shutdown = function() {
 NumarkPartyMix.Deck = function(deckNumber) {
     components.Deck.call(this, deckNumber);
 
-    var channel = deckNumber - 1;
-    var deck = this;
+    const channel = deckNumber - 1;
+    const deck = this;
     this.scratchModeEnabled = false;
 
     this.playButton = new components.PlayButton({
@@ -89,7 +90,7 @@ NumarkPartyMix.Deck = function(deckNumber) {
         midi: [0x90 + channel, 0x1B],
         key: "pfl",
         output: function(value) {
-            var note = (value === 0x00 ? 0x80 : 0x90) + channel;
+            const note = (value === 0x00 ? 0x80 : 0x90) + channel;
             midi.sendShortMsg(note, 0x1B, this.outValueScale(value));
         }
     });
@@ -108,12 +109,12 @@ NumarkPartyMix.Deck = function(deckNumber) {
     });
 
     this.treble = new components.Pot({
-        group: "[EqualizerRack1_" + this.currentDeck + "_Effect1]",
+        group: `[EqualizerRack1_${ this.currentDeck }_Effect1]`,
         inKey: "parameter3"
     });
 
     this.bass = new components.Pot({
-        group: "[EqualizerRack1_" + this.currentDeck + "_Effect1]",
+        group: `[EqualizerRack1_${ this.currentDeck }_Effect1]`,
         inKey: "parameter1"
     });
 
@@ -181,7 +182,7 @@ NumarkPartyMix.Deck = function(deckNumber) {
     });
 };
 
-NumarkPartyMix.Deck.prototype = new components.Deck();
+NumarkPartyMix.Deck.prototype = Object.create(components.Deck.prototype);
 
 NumarkPartyMix.PadSection = function(deckNumber) {
     components.ComponentContainer.call(this);
@@ -200,12 +201,12 @@ NumarkPartyMix.PadSection = function(deckNumber) {
     };
 
     this.padPress = function(channel, control, value, status, group) {
-        var i = (control - 0x14) % 8;
+        const i = (control - 0x14) % 8;
         this.currentMode.connections[i].input(channel, control, value, status, group);
     };
 
     this.setMode = function(control) {
-        var newMode = this.modes[control];
+        const newMode = this.modes[control];
         this.currentMode.forEachComponent(function(component) {
             component.disconnect();
         });
@@ -229,9 +230,9 @@ NumarkPartyMix.ModeHotcue = function(deckNumber) {
     this.control = NumarkPartyMix.PadModeControls.HOTCUE;
 
     this.connections = new components.ComponentContainer();
-    for (var i = 0; i < 4; i++) {
+    for (let i = 0; i < 4; i++) {
         this.connections[i] = new components.HotcueButton({
-            group: "[Channel" + deckNumber + "]",
+            group: `[Channel${ deckNumber }]`,
             midi: [0x93 + deckNumber, 0x14 + i],
             number: i + 1,
             outConnect: false
@@ -246,13 +247,13 @@ NumarkPartyMix.ModeLoop = function(deckNumber) {
     this.control = NumarkPartyMix.PadModeControls.AUTOLOOP;
 
     this.connections = new components.ComponentContainer();
-    for (var i = 0; i < 4; i++) {
+    for (let i = 0; i < 4; i++) {
         this.connections[i] = new components.Button({
-            group: "[Channel" + deckNumber + "]",
+            group: `[Channel${ deckNumber }]`,
             midi: [0x93 + deckNumber, 0x14 + i],
             size: NumarkPartyMix.autoLoopSizes[i],
-            inKey: "beatloop_" + NumarkPartyMix.autoLoopSizes[i] + "_toggle",
-            outKey: "beatloop_" + NumarkPartyMix.autoLoopSizes[i] + "_enabled",
+            inKey: `beatloop_${ NumarkPartyMix.autoLoopSizes[i] }_toggle`,
+            outKey: `beatloop_${ NumarkPartyMix.autoLoopSizes[i] }_enabled`,
             outConnect: false
         });
     }
@@ -267,9 +268,9 @@ NumarkPartyMix.ModeLoop.prototype = Object.create(components.ComponentContainer.
 NumarkPartyMix.ModeSampler = function(deckNumber) {
     components.ComponentContainer.call(this);
     this.control = NumarkPartyMix.PadModeControls.SAMPLER;
-    var sampleoffset = (deckNumber - 1) * 4;
+    const sampleoffset = (deckNumber - 1) * 4;
     this.connections = new components.ComponentContainer();
-    for (var i = 0; i < 4; i++) {
+    for (let i = 0; i < 4; i++) {
         this.connections[i] = new components.SamplerButton({
             midi: [0x93 + deckNumber, 0x14 + i],
             number: 1 + i + sampleoffset,
@@ -299,14 +300,14 @@ NumarkPartyMix.ModeEFX = function(deckNumber) {
 
     this.control = NumarkPartyMix.PadModeControls.EFX;
 
-    var fx = [
-        "[EffectRack1_EffectUnit" + deckNumber + "_Effect1]",
-        "[EffectRack1_EffectUnit" + deckNumber + "_Effect2]",
-        "[EffectRack1_EffectUnit" + deckNumber + "_Effect3]"
+    const fx = [
+        `[EffectRack1_EffectUnit${ deckNumber }_Effect1]`,
+        `[EffectRack1_EffectUnit${ deckNumber }_Effect2]`,
+        `[EffectRack1_EffectUnit${ deckNumber }_Effect3]`
     ];
 
     this.connections = new components.ComponentContainer();
-    var p = this.connections;
+    const p = this.connections;
 
     fx.forEach(function(fx, i) {
         p[i] = new components.Button({
@@ -318,7 +319,7 @@ NumarkPartyMix.ModeEFX = function(deckNumber) {
     });
     p[3] = new components.Button({
         midi: [0x93 + deckNumber, 0x17],
-        group: "[EffectRack1_EffectUnit" + deckNumber + "]",
+        group: `[EffectRack1_EffectUnit${ deckNumber }]`,
         key: "mix_mode",
         type: components.Button.prototype.types.toggle,
         outValueScale: function(val) {
@@ -332,12 +333,12 @@ NumarkPartyMix.ModeEFX.prototype = Object.create(components.ComponentContainer.p
 NumarkPartyMix.Browse = function() {
     components.ComponentContainer.call(this);
 
-    var browse = this;
+    const browse = this;
     this.knobpressed = false;
 
     this.knob = new components.Encoder({
         input: function(channel, control, value) {
-            var direction;
+            let direction;
             if (browse.knobpressed) {
                 if (value > 0x40) {
                     engine.setParameter("[Library]", "MoveFocusForward", 1);