bugfixes, accessibility settings

web/js/3las/fallback/3las.fallback.js

@@ -72,7 +72,7 @@ var Fallback = /** @class */ (function () {
     Fallback.prototype.Init = function (webSocket) {
         this.MobileUnmute();
         this.WebSocket = webSocket;
-        this.WebSocket.Send(JSON.stringify({
+        this.WebSocket?.Send(JSON.stringify({
             "type": "fallback",
             "data": this.SelectedFormatName
         }));

web/js/3las/main.js

@@ -4,15 +4,17 @@ let Stream;
 function Init(_ev) {
     try {
         const settings = new _3LAS_Settings();
-        Stream = new _3LAS(null, settings);
+        if (!Stream) {  // Ensure Stream is not re-initialized
+            Stream = new _3LAS(null, settings);
+        }
     } catch (error) {
         console.log(error);
         return;
     }
 
     Stream.ConnectivityCallback = OnConnectivityCallback;
-    $(".playbutton").on('click', OnPlayButtonClick);
-    $("#volumeSlider").on("input", updateVolume);
+    $(".playbutton").off('click').on('click', OnPlayButtonClick);  // Ensure only one event handler is attached
+    $("#volumeSlider").off("input").on("input", updateVolume);  // Ensure only one event handler is attached
 }
 
 function OnConnectivityCallback(isConnected) {
@@ -22,21 +24,20 @@ function OnConnectivityCallback(isConnected) {
 function OnPlayButtonClick(_ev) {
     const $playbutton = $('.playbutton');
     $playbutton.find('.fa-solid').toggleClass('fa-play fa-stop');
-    try {
-        if (Stream.ConnectivityFlag) {
-            Stream.Stop();
-        } else {
-            Stream.Start();
-            $playbutton.addClass('bg-gray').prop('disabled', true);
-            setTimeout(() => {
-                $playbutton.removeClass('bg-gray').prop('disabled', false);
-            }, 3000);
-        }
-    } catch (error) {
-        console.error(error);
+
+    if (Stream.ConnectivityFlag) {
+        Stream.Stop();
+    } else {
+        Stream.Start();
+        $playbutton.addClass('bg-gray').prop('disabled', true);
+        setTimeout(() => {
+            $playbutton.removeClass('bg-gray').prop('disabled', false);
+        }, 3000);
     }
 }
 
 function updateVolume() {
     Stream.Volume = $(this).val();
 }
+
+$(document).ready(Init); 

web/js/chat.js

@@ -33,6 +33,7 @@ $(document).ready(function() {
               if (!messageData.history) {
                   chatMessageCount++;
                   chatMessagesCount.text(chatMessageCount);
+                  chatMessagesCount.attr("aria-label", "Chat (" + chatMessageCount + " unread)");
                   chatButton.removeClass('bg-color-2').addClass('bg-color-4');
               }
           }

web/js/confighandler.js

@@ -59,7 +59,7 @@ function submitData() {
     }).data('value') || "tef");
 
     const softwareMode = $('#audio-software-mode').is(":checked") || false;
-    const startupVolume = $('#startup-volume').val() || '100';
+    const startupVolume = $('#startup-volume').val() || '1';
 
     const tunerName = $('#webserver-name').val() || 'FM Tuner';
     const tunerDesc = $('#webserver-desc').val() || 'Default FM tuner description';

web/js/dropdown.js

@@ -25,13 +25,10 @@ const selectOption = (event) => {
       tuneTo(getCurrentFreq()); //Reset RDS when change antenna input
       break;
     case 'data-bw':
-      if($(event.currentTarget).attr('data-value') > 500) { 
-        socket.send("F" + $(event.currentTarget).attr('data-value'));
-      } else {
+        legacyBwValue = $(event.currentTarget).attr('data-value2') || "";
+        socket.send("F" + legacyBwValue);
         socket.send("W" + $(event.currentTarget).attr('data-value'));
-      }
-
-      $currentDropdown.find('input').val($(event.currentTarget).text());
+        $currentDropdown.find('input').val($(event.currentTarget).text());
       break;
     default:
       $currentDropdown.find('input').val($(event.currentTarget).text());

web/js/init.js

@@ -1,9 +1,9 @@
-var currentDate = new Date('May 4, 2024 01:00:00');
+var currentDate = new Date('May 20, 2024 22:00:00');
 var day = currentDate.getDate();
 var month = currentDate.getMonth() + 1; // Months are zero-indexed, so add 1
 var year = currentDate.getFullYear();
 var formattedDate = day + '/' + month + '/' + year;
-var currentVersion = 'v1.2.1 [' + formattedDate + ']';
+var currentVersion = 'v1.2.2 [' + formattedDate + ']';
 
 getInitialSettings();
 

web/js/main.js

@@ -370,7 +370,7 @@ socket.onmessage = (event) => {
         console.log('Kick iniitiated.')
         setTimeout(() => {
           window.location.href = '/403';
-        }, 500); // Adjust the delay as needed
+        }, 500);
         return;
     }
 
@@ -763,6 +763,7 @@ const updateDataElements = throttle(function(parsedData) {
         $dataPs.attr('aria-label', parsedData.ps);
         $dataRt0.attr('aria-label', parsedData.rt0);
         $dataRt1.attr('aria-label', parsedData.rt1);
+        $('#users-online-container').attr("aria-label", "Online users: " + parsedData.users);
     }
 }, 100); // Update at most once every 100 milliseconds
 
@@ -850,9 +851,11 @@ function toggleAdminLock() {
 
     if($adminLockButton.hasClass('active')) {
         socket.send('wL0');
+        $adminLockButton.attr('aria-label', '"ock Tuner (Admin)')
         $adminLockButton.removeClass('active');
     } else {
         socket.send('wL1');
+        $adminLockButton.attr('aria-label', 'Unlock Tuner (Admin)')
         $adminLockButton.addClass('active');
     }
 }
@@ -863,9 +866,11 @@ function togglePasswordLock() {
     if($passwordLockButton.hasClass('active')) {
         socket.send('wT0');
         $passwordLockButton.removeClass('active');
+        $passwordLockButton.attr('aria-label', 'Lock Tuner (Password tune)')
     } else {
         socket.send('wT1');
         $passwordLockButton.addClass('active');
+        $passwordLockButton.attr('aria-label', 'Unlock Tuner (Password tune)')
     }
 }