Fix building adjustment requests

Author: Lord-Grey

assets/webconfig/js/content_remote.js

@@ -81,7 +81,8 @@ $(document).ready(function () {
                       </div>`;
           $('.crtbody').append(createTableRow([title, property], false, true));
           createCP(`cr_${sColor[key].key}`, value, function (rgb, hex, e) {
-            requestAdjustment(e.target.id.substr(e.target.id.indexOf("_") + 1), `[${rgb.r},${rgb.g},${rgb.b}]`);
+            const elementName = e.target.id.substr(e.target.id.indexOf("_") + 1);
+            requestAdjustment(elementName, [rgb.r,rgb.g,rgb.b]);
           });
         }
         // Handle boolean type adjustments
@@ -93,7 +94,8 @@ $(document).ready(function () {
           $('.crtbody').append(createTableRow([title, property], false, true));
 
           $('#cr_' + sColor[key].key).off().on('change', function (e) {
-            requestAdjustment(e.target.id.substr(e.target.id.indexOf("_") + 1), e.currentTarget.checked);
+            const elementName = e.target.id.substr(e.target.id.indexOf("_") + 1);
+            requestAdjustment(elementName, e.currentTarget.checked);
           });
         }
         // Handle number type adjustments
@@ -110,8 +112,9 @@ $(document).ready(function () {
 
           $('.crtbody').append(createTableRow([title, property], false, true));
           $('#cr_' + sColor[key].key).off().on('change', function (e) {
-            valValue(this.id, this.value, this.min, this.max);
-            requestAdjustment(e.target.id.substr(e.target.id.indexOf("_") + 1), e.currentTarget.value);
+            const elementName = e.target.id.substr(e.target.id.indexOf("_") + 1);
+            const value = valValue(this.id, this.value, this.min, this.max);
+            requestAdjustment(elementName, value);
           });
         }
       }

assets/webconfig/js/hyperion.js

@@ -542,7 +542,7 @@ function requestAdjustment(type, value, complete) {
   if (complete === true)
     sendToHyperion("adjustment", "", { adjustment: type });
   else
-    sendToHyperion("adjustment", "", { adjustment: { type: value } });
+    sendToHyperion("adjustment", "", { adjustment: { [type]: value } });
 }
 
 async function requestLedDeviceDiscovery(ledDeviceType, params) {

assets/webconfig/js/wizards/colorCalibrationKodiWizard.js

@@ -431,13 +431,10 @@ const colorCalibrationKodiWizard = (() => {
       stop(true);
     });
 
-    wiz_editor.on("change", function (e) {
-      const val = wiz_editor.getEditor('root.color.channelAdjustment.' + profile + '').getValue();
-      const temp = JSON.parse(JSON.stringify(val));
-      delete temp.leds
-      requestAdjustment(JSON.stringify(temp), "", true);
+    wiz_editor.on("change", function () {
+      const { leds, ...adjustments } = wiz_editor.getEditor('root.color.channelAdjustment.' + profile).getValue();
+      requestAdjustment(adjustments, "", true);
     });
-
     step++
     performAction();
   }