kuba/fm-dx-webserver
1
0
Fork 0
mirror of https://github.com/KubaPro010/fm-dx-webserver.git synced 2026-02-27 14:33:52 +01:00
Code Issues Activity

bugfixes

Browse Source
This commit is contained in:
NoobishSVK
2024-03-04 22:59:51 +01:00
parent eae5fcd45b
commit f1b1449909
6 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datahandler.js
View File

@@ -412,5 +412,5 @@ function showOnlineUsers(currentUsers) {
} }
module.exports = { module.exports = {
handleData, showOnlineUsers, dataToSend, initialData handleData, showOnlineUsers, dataToSend, initialData, resetToDefault
}; };

7
index.js
View File

@@ -533,10 +533,14 @@ wss.on('connection', (ws, request) => {
return; return;
} }
if(command.includes('\'')) {
return;
}
if(command.startsWith('T')) { if(command.startsWith('T')) {
let tuneFreq = Number(command.slice(1)) / 1000; let tuneFreq = Number(command.slice(1)) / 1000;
if(serverConfig.webserver.tuningLimit === true && (tuneFreq < serverConfig.webserver.tuningLowerLimit || tuneFreq > serverConfig.webserver.tuningUpperLimit)) { if(serverConfig.webserver.tuningLimit === true && (tuneFreq < serverConfig.webserver.tuningLowerLimit || tuneFreq > serverConfig.webserver.tuningUpperLimit) || isNaN(tuneFreq)) {
return; return;
} }
} }
@@ -569,6 +573,7 @@ wss.on('connection', (ws, request) => {
setTimeout(function() { setTimeout(function() {
if(currentUsers === 0) { if(currentUsers === 0) {
client.write('T' + Math.round(serverConfig.defaultFreq * 1000) +'\n'); client.write('T' + Math.round(serverConfig.defaultFreq * 1000) +'\n');
dataHandler.resetToDefault();
dataHandler.dataToSend.freq = Number(serverConfig.defaultFreq).toFixed(3); dataHandler.dataToSend.freq = Number(serverConfig.defaultFreq).toFixed(3);
} }
}, 10000) }, 10000)

2
web/index.ejs
View File

@@ -145,7 +145,7 @@
<div class="panel-33 flex-container flex-phone" id="tune-buttons"> <div class="panel-33 flex-container flex-phone" id="tune-buttons">
<button id="freq-down" aria-label="Tune down by 100 KHz"><i class="fa-solid fa-chevron-left"></i></button> <button id="freq-down" aria-label="Tune down by 100 KHz"><i class="fa-solid fa-chevron-left"></i></button>
<input type="text" id="commandinput" inputmode="numeric" placeholder="Frequency" aria-label="Current frequency: "> <input type="text" id="commandinput" inputmode="numeric" placeholder="Frequency" autocomplete="off" aria-label="Current frequency: ">
<button id="freq-up" aria-label="Tune up by 100 KHz"><i class="fa-solid fa-chevron-right"></i></button> <button id="freq-up" aria-label="Tune up by 100 KHz"><i class="fa-solid fa-chevron-right"></i></button>
</div> </div>

7
web/js/chat.js
View File

@@ -27,7 +27,9 @@ $(document).ready(function() {
messages.append(chatMessage); messages.append(chatMessage);
if($('#chat-chatbox').is(':visible')) { if($('#chat-chatbox').is(':visible')) {
setTimeout(function() {
$('#chat-chatbox').scrollTop($('#chat-chatbox')[0].scrollHeight); $('#chat-chatbox').scrollTop($('#chat-chatbox')[0].scrollHeight);
}, 100)
} else { } else {
if(messageData.history !== true) { if(messageData.history !== true) {
chatMessageCount++; chatMessageCount++;
@@ -50,11 +52,14 @@ $(document).ready(function() {
}); });
$('.chatbutton').click(function() { $('.chatbutton').click(function() {
$('#chat-chatbox').scrollTop($('#chat-chatbox')[0].scrollHeight);
chatMessageCount = 0; chatMessageCount = 0;
$('.chat-messages-count').text(chatMessageCount); $('.chat-messages-count').text(chatMessageCount);
$('.chatbutton').removeClass('bg-color-4').addClass('bg-color-2'); $('.chatbutton').removeClass('bg-color-4').addClass('bg-color-2');
$('#chat-send-message').focus(); $('#chat-send-message').focus();
setTimeout(function() {
$('#chat-chatbox').scrollTop($('#chat-chatbox')[0].scrollHeight);
}, 100)
}); });
$('#chat-nickname').keypress(function(event) { $('#chat-nickname').keypress(function(event) {

1
web/js/main.js
View File

@@ -366,6 +366,7 @@ function checkKey(e) {
return; return;
} }
$('#volumeSlider').blur();
getCurrentFreq(); getCurrentFreq();
if (socket.readyState === WebSocket.OPEN) { if (socket.readyState === WebSocket.OPEN) {

8
web/js/settings.js
View File

@@ -1,4 +1,10 @@
var currentVersion = 'v1.1.2 [3.3.2024]'; var currentDate = new Date('March 4, 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.1.2a [' + formattedDate + ']';
/** /**
* Themes * Themes