Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for radio status

Browse Source
This commit is contained in:
Szymon Porwolik
2025-11-07 18:48:30 +01:00
parent e0be81fa26
commit 6cb2cf2d87
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
assets/js/cat.js
View File

@@ -380,10 +380,10 @@ $(document).ready(function() {
// Use translation variable if available, fallback to English
var offlineText = typeof lang_cat_working_offline !== 'undefined' ? lang_cat_working_offline : 'Working without CAT connection';
const offlineHtml = '<span id="radio_cat_state" style="display: inline-flex; align-items: center; font-size: 0.875rem;">' +
const offlineHtml = '<span id="radio_cat_state" class="text-body" style="display: inline-flex; align-items: center; font-size: 0.875rem;">' +
'<i class="fas fa-unlink text-warning" style="margin-right: 5px;"></i>' +
'<span style="margin-right: 5px;">' + offlineText + '</span>' +
'<i id="radio-status-icon" class="fas fa-info-circle" style="cursor: help;" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="bottom"></i>' +
'<i id="radio-status-icon" class="fas fa-info-circle text-muted" style="cursor: help;" data-bs-toggle="tooltip" data-bs-html="true" data-bs-placement="bottom"></i>' +
'</span>';
let tooltipContent;
@@ -888,6 +888,14 @@ $(document).ready(function() {
radioCatUrlCache = {};
radioNameCache = {};
// If switching to None, disable CAT tracking FIRST before stopping connections
// This prevents any pending updates from interfering with the offline status
if (selectedRadioId == '0') {
if (typeof window.isCatTrackingEnabled !== 'undefined') {
window.isCatTrackingEnabled = false;
}
}
// Hide radio status box (both success and error states)
$('#radio_cat_state').remove();
@@ -911,9 +919,11 @@ $(document).ready(function() {
if (typeof dxwaterfall_cat_state !== 'undefined') {
dxwaterfall_cat_state = "none";
}
// Disable CAT Control button when no radio is selected
// Disable CAT Connection button when no radio is selected
$('#toggleCatTracking').prop('disabled', true).addClass('disabled');
// Display offline status when no radio selected (always show, not just in ultra-compact)
// Also turn OFF CAT Connection (remove green button state)
$('#toggleCatTracking').removeClass('btn-success').addClass('btn-secondary');
// Display offline status when no radio selected
displayOfflineStatus('no_radio');
} else if (selectedRadioId == 'ws') {
websocketIntentionallyClosed = false; // Reset flag when opening WebSocket

13
assets/js/sections/bandmap_list.js
View File

@@ -2060,8 +2060,12 @@ $(function() {
isCatTrackingEnabled = false;
window.isCatTrackingEnabled = false;
// Hide radio status
$('#radio_cat_state').remove();
// Show offline status instead of just hiding
if (typeof window.displayOfflineStatus === 'function') {
window.displayOfflineStatus('no_radio');
} else {
$('#radio_cat_state').remove();
}
// Re-enable band filter controls
enableBandFilterControls();
@@ -3184,8 +3188,11 @@ $(function() {
if (selectedRadio && selectedRadio !== '0' && typeof window.displayOfflineStatus === 'function') {
// Radio is selected but CAT Control disabled - show offline status
window.displayOfflineStatus('cat_disabled');
} else if (selectedRadio === '0' && typeof window.displayOfflineStatus === 'function') {
// No radio selected - show offline status
window.displayOfflineStatus('no_radio');
} else {
// No radio selected - just hide radio status
// Fallback: just hide radio status
$('#radio_cat_state').remove();
}