messenger.vue css confict resolution

diff --git a/src/components/inputItem/inputController.ts b/src/components/inputItem/inputController.ts
index 6fb5e8cb3d9bd9eea5d52f88018cc82a9f35c799..d9aeb51d3784eb81950f9d7ac58498e41c676d87 100644 (file)
--- a/src/components/inputItem/inputController.ts
+++ b/src/components/inputItem/inputController.ts
@@ -63,7 +63,7 @@ export default function useInputController() {
             return;
         }
         if (input === " " && isRecording.value === false) {
-            // isTyping.value = false;
+            isTyping.value = false;
             isRecording.value = true;
             post('update-recorder', isRecording.value);
             return;

diff --git a/src/views/messenger.vue b/src/views/messenger.vue
index b1e965f2b9471de62a91a7e3e4edd37e111a149f..e0769da10b4eacb517c09b2ddccf453ac83facfc 100644 (file)
--- a/src/views/messenger.vue
+++ b/src/views/messenger.vue
@@ -25,19 +25,19 @@ export default defineComponent({
     // List of messages in the view.
     // Oldest message first.
     const messages: Message[] = reactive([]);
-    const messages_ref: any = {}
+    const messages_ref: any = {};
 
     // Render a message.
     // Called on "enter" instead of on "recv message"
     const render = (message: Message) => {
       messages.push(message);
       messages_ref[message.id] = message;
-    }
+    };
 
     // Annotate/update an existing message.
     const annotate = (message: Message) => {
-      1+1
-    }
+      1 + 1;
+    };
 
     onMounted(() => {
       // Listen for new messages to render.
@@ -61,19 +61,11 @@ export default defineComponent({
 #messenger {
   position: fixed;
 
-<<<<<<< HEAD
   width: 100vw;
-  min-height: 100vh;
-=======
-  #messenger {
-    position: fixed;
-
-    width: 100vw;
 
-    overflow-y: scroll;
+  overflow-y: scroll;
 
-    bottom: 0;
->>>>>>> origin/main
+  bottom: 0;
 
   overflow-y: scroll;