From b644b36fe4d6a8e41edd04d2d7fe119e89019664 Mon Sep 17 00:00:00 2001 From: Mashintime Date: Sat, 25 Feb 2023 05:29:09 +0000 Subject: [PATCH] Prettified Code! --- gui/preload-chat.js | 55 +++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/gui/preload-chat.js b/gui/preload-chat.js index 9d0ed3ad..48228522 100644 --- a/gui/preload-chat.js +++ b/gui/preload-chat.js @@ -762,7 +762,10 @@ update_chat = function (obj) { // increment callsign counter callsign_counter++; dxcallsigns.add(dxcallsign); - if ((callsign_counter == 1 && selected_callsign=="") || selected_callsign == dxcallsign ) { + if ( + (callsign_counter == 1 && selected_callsign == "") || + selected_callsign == dxcallsign + ) { var callsign_selected = "active show"; //document.getElementById('chatModuleDxCall').value = dxcallsign; selected_callsign = dxcallsign; @@ -1497,24 +1500,26 @@ async function updateAllChat(clear) { } //Ensure we create an index before running db.find //We can't rely on the default index existing before we get here...... :'( - await db.createIndex({ - index: { - fields: [{ timestamp: "asc" }], - }, - }) + await db + .createIndex({ + index: { + fields: [{ timestamp: "asc" }], + }, + }) .then(async function (result) { // handle result - await db.find({ - selector: { - $and: [{ timestamp: { $exists: true } }, { $or: chatFilter }], - //$or: chatFilter - }, - sort: [ - { - timestamp: "asc", + await db + .find({ + selector: { + $and: [{ timestamp: { $exists: true } }, { $or: chatFilter }], + //$or: chatFilter }, - ], - }) + sort: [ + { + timestamp: "asc", + }, + ], + }) .then(async function (result) { // handle result async if (typeof result !== "undefined") { @@ -1537,12 +1542,14 @@ async function updateAllChat(clear) { .catch(function (err) { console.log(err); }); - if (clear == true && dxcallsigns.has(selected_callsign) == false) { - //Selected call sign is not visible, reset to first call sign - let tmp = dxcallsigns.entries().next().value[0]; - selected_callsign=tmp; - document.getElementById("chat-" + tmp + "-list").classList.add("active","show"); - document.getElementById("chat-" + tmp ).classList.add("active","show"); - scrollMessagesToBottom(); - } + if (clear == true && dxcallsigns.has(selected_callsign) == false) { + //Selected call sign is not visible, reset to first call sign + let tmp = dxcallsigns.entries().next().value[0]; + selected_callsign = tmp; + document + .getElementById("chat-" + tmp + "-list") + .classList.add("active", "show"); + document.getElementById("chat-" + tmp).classList.add("active", "show"); + scrollMessagesToBottom(); + } }