(fix) infinite loading when no messages

antoine92190 · antoine92190 · commit 7f5006405e0b · 2021-04-05T13:37:17.000+02:00
diff --git a/src/ChatWindow/Room/Room.vue b/src/ChatWindow/Room/Room.vue
@@ -465,7 +465,7 @@ export default {
 		room: {
 			immediate: true,
 			handler(newVal, oldVal) {
-				if (!oldVal || (newVal && newVal.roomId !== oldVal.roomId)) {
+				if (newVal.roomId && (!oldVal || newVal.roomId !== oldVal.roomId)) {
 					this.onRoomChanged()
 				}
 			}
@@ -552,6 +552,10 @@ export default {
 				setTimeout(() => this.onChangeInput())
 			}
 
+			if (!this.messages.length && this.messagesLoaded) {
+				this.loadingMessages = false
+			}
+
 			const unwatch = this.$watch(
 				() => this.messages,
 				val => {

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ export default {`
`465`	`465`	`room: {`
`466`	`466`	`immediate: true,`
`467`	`467`	`handler(newVal, oldVal) {`
`468`		`- if (!oldVal \|\| (newVal && newVal.roomId !== oldVal.roomId)) {`
	`468`	`+ if (newVal.roomId && (!oldVal \|\| newVal.roomId !== oldVal.roomId)) {`
`469`	`469`	`this.onRoomChanged()`
`470`	`470`	`}`
`471`	`471`	`}`
`@@ -552,6 +552,10 @@ export default {`
`552`	`552`	`setTimeout(() => this.onChangeInput())`
`553`	`553`	`}`
`554`	`554`
	`555`	`+ if (!this.messages.length && this.messagesLoaded) {`
	`556`	`+ this.loadingMessages = false`
	`557`	`+ }`
	`558`	`+`
`555`	`559`	`const unwatch = this.$watch(`
`556`	`560`	`() => this.messages,`
`557`	`561`	`val => {`