Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
2fa76a8912
7 changed files with 253 additions and 14 deletions
|
|
@ -25,14 +25,19 @@ export default defineComponent({
|
|||
// List of messages in the view.
|
||||
// Oldest message first.
|
||||
const messages: Message[] = reactive([]);
|
||||
const messages_ref: any = {}
|
||||
|
||||
// Render a message.
|
||||
// Called on "enter" instead of on "recv message"
|
||||
const render = (message: Message) => {
|
||||
messages.push(message);
|
||||
console.log(
|
||||
`Pushing: ${message.modifier}: ${message.content.text} ${message.context}`
|
||||
);
|
||||
};
|
||||
messages_ref[message.id] = message;
|
||||
}
|
||||
|
||||
// Annotate/update an existing message.
|
||||
const annotate = (message: Message) => {
|
||||
1+1
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
// Listen for new messages to render.
|
||||
|
|
@ -56,8 +61,19 @@ export default defineComponent({
|
|||
#messenger {
|
||||
position: fixed;
|
||||
|
||||
<<<<<<< HEAD
|
||||
width: 100vw;
|
||||
min-height: 100vh;
|
||||
=======
|
||||
#messenger {
|
||||
position: fixed;
|
||||
|
||||
width: 100vw;
|
||||
|
||||
overflow-y: scroll;
|
||||
|
||||
bottom: 0;
|
||||
>>>>>>> origin/main
|
||||
|
||||
overflow-y: scroll;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue