From 27ebe8b6620070585d6f752c62d1ad577ba8e0ff Mon Sep 17 00:00:00 2001 From: Paul Donald Date: Sun, 6 Apr 2025 22:22:59 +0200 Subject: [PATCH] luci-mod-network: give wireless.js ES2016 treatment and refactor Follow-up fix for cdce600aaec66f762f18d608c74cbf3abcafe1c7 when certain elements are empty. Signed-off-by: Paul Donald --- .../resources/view/network/wireless.js | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js index ff27f64ede..aff9e86f77 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js @@ -202,26 +202,26 @@ function format_wifirate(rate) { const eht_gi = rate?.eht_gi ?? 0; const eht_dcm = rate?.eht_dcm ?? 0; - if (ht ?? vht) s += [ + if (ht || vht) s += [ vht && `, VHT-MCS\xa0${$mcs}`, - nss && `VHT-NSS\xa0${nss}`, - ht && `MCS\xa0${mcs}`, - sgi && _('Short GI').replace(/ /g, '\xa0') - ].filter(Boolean).join(', '); + nss && `, VHT-NSS\xa0${nss}`, + ht && `, MCS\xa0${mcs}`, + sgi && ', ' + _('Short GI').replace(/ /g, '\xa0') + ].filter(Boolean).join(''); if (he) s += [ `, HE-MCS\xa0${mcs}`, - nss && `HE-NSS\xa0${nss}`, - he_gi && `HE-GI\xa0${he_gi}`, - he_dcm && `HE-DCM\xa0${he_dcm}` - ].filter(Boolean).join(', '); + nss && `, HE-NSS\xa0${nss}`, + he_gi && `, HE-GI\xa0${he_gi}`, + he_dcm && `, HE-DCM\xa0${he_dcm}` + ].filter(Boolean).join(''); if (eht) s += [ `, EHT-MCS\xa0${mcs}`, - nss && `EHT-NSS\xa0${nss}`, - he_gi && `EHT-GI\xa0${eht_gi}`, - he_dcm && `EHT-DCM\xa0${eht_dcm}` - ].filter(Boolean).join(', '); + nss && `, EHT-NSS\xa0${nss}`, + he_gi && `, EHT-GI\xa0${eht_gi}`, + he_dcm && `, EHT-DCM\xa0${eht_dcm}` + ].filter(Boolean).join(''); return s; } -- 2.30.2