From ba28f035752228989a56b47b3da08201c730f865 Mon Sep 17 00:00:00 2001 From: Maxim Devaev Date: Sat, 8 Feb 2025 19:22:56 +0200 Subject: [PATCH] refactoring --- web/share/js/kvm/hid.js | 14 +++++++------- web/share/js/kvm/info.js | 36 ++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/web/share/js/kvm/hid.js b/web/share/js/kvm/hid.js index e3466896..c471d4c1 100644 --- a/web/share/js/kvm/hid.js +++ b/web/share/js/kvm/hid.js @@ -183,13 +183,13 @@ export function Hid(__getGeometry, __recorder) { let avail_json = JSON.stringify(avail); if (el.__avail_json !== avail_json) { let html = ""; - for (let pair of [ + for (let kv of [ ["USB", "usb"], ["PS/2", "ps2"], ["Off", "disabled"], ]) { - if (avail.includes(pair[1])) { - html += tools.radio.makeItem("hid-outputs-keyboard-radio", pair[0], pair[1]); + if (avail.includes(kv[1])) { + html += tools.radio.makeItem("hid-outputs-keyboard-radio", kv[0], kv[1]); } } el.innerHTML = html; @@ -211,16 +211,16 @@ export function Hid(__getGeometry, __recorder) { if (el.__avail_json !== avail_json) { has_relative = false; let html = ""; - for (let pair of [ + for (let kv of [ ["Absolute", "usb", false], ["Abs-Win98", "usb_win98", false], ["Relative", "usb_rel", true], ["PS/2", "ps2", true], ["Off", "disabled", false], ]) { - if (avail.includes(pair[1])) { - html += tools.radio.makeItem("hid-outputs-mouse-radio", pair[0], pair[1]); - has_relative = (has_relative || pair[2]); + if (avail.includes(kv[1])) { + html += tools.radio.makeItem("hid-outputs-mouse-radio", kv[0], kv[1]); + has_relative = (has_relative || kv[2]); } } el.innerHTML = html; diff --git a/web/share/js/kvm/info.js b/web/share/js/kvm/info.js index 94831a0e..eaabc45b 100644 --- a/web/share/js/kvm/info.js +++ b/web/share/js/kvm/info.js @@ -145,32 +145,32 @@ export function Info() { return __formatUl([["Status", __red("Not available")]]); } else { state = state.state; - let pairs = [ + let kvs = [ ["Status", (state.fan.ok ? __green("Ok") : __red("Failed"))], ["Desired speed", tools.escape(`${state.fan.speed}%`)], ["PWM", tools.escape(`${state.fan.pwm}`)], ]; if (state.hall.available) { - pairs.push(["RPM", __colored(state.fan.ok, tools.escape(`${state.hall.rpm}`))]); + kvs.push(["RPM", __colored(state.fan.ok, tools.escape(`${state.hall.rpm}`))]); } - return __formatUl(pairs); + return __formatUl(kvs); } }; var __formatTemp = function(temp) { - let pairs = []; + let kvs = []; for (let field of Object.keys(temp).sort()) { - pairs.push([ + kvs.push([ tools.escape(field.toUpperCase()), tools.escape(`${temp[field]}`) + "°C", ]); } - return __formatUl(pairs); + return __formatUl(kvs); }; var __formatThrottling = function(throttling) { if (throttling !== null) { - let pairs = []; + let kvs = []; for (let field of Object.keys(throttling.parsed_flags).sort()) { let flags = throttling.parsed_flags[field]; let key = tools.upperFirst(field).replace("_", " "); @@ -178,9 +178,9 @@ export function Info() { if (!throttling.ignore_past) { value += "; " + (flags["past"] ? __red("In the past") : __green("Never")); } - pairs.push([tools.escape(key), value]); + kvs.push([tools.escape(key), value]); } - return __formatUl(pairs); + return __formatUl(kvs); } else { return "NO DATA"; } @@ -209,33 +209,33 @@ export function Info() { }; var __formatStreamerFeatures = function(features) { - let pairs = []; + let kvs = []; for (let field of Object.keys(features).sort()) { - pairs.push([ + kvs.push([ tools.escape(field), (features[field] ? "Yes" : "No"), ]); } - return __formatUl(pairs); + return __formatUl(kvs); }; var __formatUname = function(kernel) { - let pairs = []; + let kvs = []; for (let field of Object.keys(kernel).sort()) { if (field !== "system") { - pairs.push([ + kvs.push([ tools.escape(tools.upperFirst(field)), tools.escape(kernel[field]), ]); } } - return __formatUl(pairs); + return __formatUl(kvs); }; - var __formatUl = function(pairs) { + var __formatUl = function(kvs) { let html = ""; - for (let pair of pairs) { - html += `
  • ${pair[0]}: ${__commented(pair[1])}
  • `; + for (let kv of kvs) { + html += `
  • ${kv[0]}: ${__commented(kv[1])}
  • `; } return ``; };