From 664a9d06f9b5766a279ef6000b393dbc284e470f Mon Sep 17 00:00:00 2001 From: Andrew Gundersen Date: Thu, 20 Jan 2022 08:58:49 -0600 Subject: [PATCH] some initial design changes --- src/main.js | 2 +- src/render/components/app.js | 3 --- src/render/components/{ => control}/drop.js | 0 src/render/components/messenger.js | 13 ++++++------- src/session.js | 6 +++--- 5 files changed, 10 insertions(+), 14 deletions(-) rename src/render/components/{ => control}/drop.js (100%) diff --git a/src/main.js b/src/main.js index f4b803a..b5caad7 100644 --- a/src/main.js +++ b/src/main.js @@ -22,7 +22,7 @@ app.on("ready", () => initAccount(); }); -app.on("will-quit", terminateAudio); +// app.on("will-quit", terminateAudio); // When user clicks app icon (re-open) app.on("activate", createWin); diff --git a/src/render/components/app.js b/src/render/components/app.js index ffc34f7..78ab5da 100644 --- a/src/render/components/app.js +++ b/src/render/components/app.js @@ -38,6 +38,3 @@ window.mainApi.on("set-account", (account_) => { export default App; export { account }; - -// Is called when window is about to close or reload -window.onbeforeunload = () => console.log("beforeUnload"); \ No newline at end of file diff --git a/src/render/components/drop.js b/src/render/components/control/drop.js similarity index 100% rename from src/render/components/drop.js rename to src/render/components/control/drop.js diff --git a/src/render/components/messenger.js b/src/render/components/messenger.js index 3384d6d..fe73263 100644 --- a/src/render/components/messenger.js +++ b/src/render/components/messenger.js @@ -28,22 +28,18 @@ const Messenger = { { person.value = update; } - else if (typeof update == Array) - { - messages.value.push(...update); - } else if (message.content) { messages.value.push(update); } - else if (update.new) + else { - messages.value.at(-1)[update.new] = update.val; + messages.value.at(-1).content.push(update); } }); - window.mainApi.send("message", "win"); + window.mainApi.send("message", {route: "window", open: true}); }); return { person, messages, onDrop }; @@ -71,3 +67,6 @@ const Messenger = { } export default Messenger; + +// Is called when window is about to close or reload +window.onbeforeunload = () => window.mainApi.send("message", {route: "window", open: true}); diff --git a/src/session.js b/src/session.js index b4433a4..f786dcb 100644 --- a/src/session.js +++ b/src/session.js @@ -35,14 +35,14 @@ function handleUpdateQueue() function launchSession(account) { connectToPlatform(account); - initAudio(); - processContentId = setInterval(handleMessageQueue, 100); + // initAudio(); + processContentId = setInterval(handleUpdateQueue, 100); } function endSession() { clearInterval(processContentId); - terminateAudio(); + // terminateAudio(); disconnectFromPlatform(); } -- 2.43.0