Skip to content

Commit 0e28bed

Browse files
Stefaniaumbynos
authored andcommitted
improve code a bit
1 parent 1666c84 commit 0e28bed

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

home.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,19 @@
2323
jsonMsg = JSON.parse(msg);
2424
portsListing = jsonMsg.Ports;
2525
} catch {
26+
// no valid json
2627
}
2728

2829
var startsWithList = msg.indexOf('list') == 0;
2930

3031
if (listenabled.checked || (!portsListing && !startsWithList)) {
3132
let printMsg = msg;
3233
if (jsonMsg.Ports) {
34+
const validKeys = ['Name', 'SerialNumber', 'IsOpen', 'VendorID', 'ProductID'];
3335
if (jsonMsg.Network) {
34-
printMsg = `<b>Network Ports</b>:<br>${JSON.stringify(jsonMsg.Ports, ['Name', 'SerialNumber', 'IsOpen', 'VendorID', 'ProductID'], 2)}`
36+
printMsg = `<b>Network Ports</b>:<br>${JSON.stringify(jsonMsg.Ports, validKeys, 2)}`
3537
} else {
36-
printMsg = `<b>Serial Ports</b>:<br>${JSON.stringify(jsonMsg.Ports, ['Name', 'SerialNumber', 'IsOpen', 'VendorID', 'ProductID'], 2)}`
38+
printMsg = `<b>Serial Ports</b>:<br>${JSON.stringify(jsonMsg.Ports, validKeys, 2)}`
3739
}
3840
} else if (Object.keys(jsonMsg).length !== 0) {
3941
printMsg = `${JSON.stringify(jsonMsg, undefined, 2)}`;

0 commit comments

Comments
 (0)