Merge branch 'CQ-Highlighting-broken-for-DXCC' into 'master'

Fixed DXCC CQ highlighting

See merge request gridtracker.org/gridtracker!185

If this is changing anything in the UI or operational behavior, please prepare to update the wiki!
settings-file-dialogs
Matthew Chambers 2022-08-28 01:16:21 +00:00
commit 746401a52d
1 zmienionych plików z 3 dodań i 4 usunięć

Wyświetl plik

@ -7334,10 +7334,9 @@ function handleWsjtxDecode(newMessage)
if (locality == null) if (locality == null)
{ {
// Check the prefix for dxcc direct // Check the prefix for dxcc direct
var dxcc = callsignToDxcc(CCd); if (CCd in g_prefixToMap)
if (dxcc != -1)
{ {
locality = g_worldGeoData[g_dxccToGeoData[dxcc]].geo; locality = g_worldGeoData[g_prefixToMap[CCd]].geo;
if (locality == "deleted") locality = null; if (locality == "deleted") locality = null;
} }
} }
@ -7412,7 +7411,7 @@ function handleWsjtxDecode(newMessage)
"</td><td>" + "</td><td>" +
newMessage.MO + newMessage.MO +
"</td><td style='color:" + "</td><td style='color:" +
messageColor + (CQ ? "cyan" : "white") +
"'>" + "'>" +
htmlEntities(newMessage.Msg) + htmlEntities(newMessage.Msg) +
"</td><td style='color:yellow'>" + "</td><td style='color:yellow'>" +