hemna/aprsd
1
0
Fork 0
mirror of https://github.com/craigerl/aprsd.git synced 2025-08-04 22:32:29 -04:00
Code Issues Projects Releases Wiki Activity

WebChat: Prevent sending message without callsign

Browse Source 
This patch adds raising an error if the user doesn't set the
to call callsign when sending a message.
This commit is contained in:
Hemna 2023-09-15 14:25:35 -04:00
parent 7130ca2fd9
commit f151ae4348
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
aprsd/web/chat/static/js/send-message.js
View File

@ -10,6 +10,16 @@ MSG_TYPE_ACK = "ack";
function size_dict(d){c=0; for (i in d) ++c; return c} function size_dict(d){c=0; for (i in d) ++c; return c}
function raise_error(msg) {
$.toast({
heading: 'Error',
text: msg,
loader: true,
loaderBg: '#9EC600',
position: 'top-center',
});
}
function init_chat() { function init_chat() {
socket.on('connect', function () { socket.on('connect', function () {
console.log("Connected to socketio"); console.log("Connected to socketio");
@ -47,11 +57,20 @@ function init_chat() {
$("#sendform").submit(function(event) { $("#sendform").submit(function(event) {
event.preventDefault(); event.preventDefault();
msg = {'to': $('#to_call').val(), to_call = $('#to_call').val();
'message': $('#message').val(), message = $('#message').val();
if (to_call == "") {
raise_error("You must enter a callsign to send a message")
return false;
} else {
if (message == "") {
raise_error("You must enter a message to send")
return false;
} }
msg = {'to': to_call, 'message': message, }
socket.emit("send", msg); socket.emit("send", msg);
$('#message').val(''); $('#message').val('');
}
}); });
init_gps(); init_gps();
@ -163,6 +182,10 @@ function init_messages() {
new_callsign = false; new_callsign = false;
} }
} }
if (first_callsign !== null) {
callsign_select(first_callsign);
}
} }
function scroll_main_content(callsign=false) { function scroll_main_content(callsign=false) {
@ -268,7 +291,7 @@ function add_callsign(callsign) {
} }
create_callsign_tab(callsign, active); create_callsign_tab(callsign, active);
callsign_list[callsign] = true; callsign_list[callsign] = true;
return true return true;
} }
function append_message(callsign, msg, msg_html) { function append_message(callsign, msg, msg_html) {
@ -288,6 +311,7 @@ function append_message(callsign, msg, msg_html) {
//Now click the tab //Now click the tab
callsign_tab_id = callsign_tab(callsign); callsign_tab_id = callsign_tab(callsign);
$(callsign_tab_id).click(); $(callsign_tab_id).click();
callsign_select(callsign);
} }
} }
@ -304,7 +328,6 @@ function append_message_html(callsign, msg_html, new_callsign) {
if ($(wrapper_id).children().length > 0) { if ($(wrapper_id).children().length > 0) {
$(wrapper_id).animate({scrollTop: $(wrapper_id)[0].scrollHeight}, "fast"); $(wrapper_id).animate({scrollTop: $(wrapper_id)[0].scrollHeight}, "fast");
} }
} }
function create_message_html(date, time, from, to, message, ack_id, msg, acked=false) { function create_message_html(date, time, from, to, message, ack_id, msg, acked=false) {
@ -433,6 +456,7 @@ function ack_msg(msg) {
} }
function callsign_select(callsign) { function callsign_select(callsign) {
console.log("callsign_select " + callsign);
var tocall = $("#to_call"); var tocall = $("#to_call");
tocall.val(callsign); tocall.val(callsign);
scroll_main_content(callsign); scroll_main_content(callsign);