|
5 | 5 | <button type="submit" :disabled="disableForm || !addRoomUsername">
|
6 | 6 | Create Room
|
7 | 7 | </button>
|
8 |
| - <button class="button-cancel" @click="addNewRoom = false"> |
9 |
| - Cancel |
10 |
| - </button> |
| 8 | + <button class="button-cancel" @click="addNewRoom = false">Cancel</button> |
11 | 9 | </form>
|
12 | 10 |
|
13 | 11 | <form v-if="inviteRoomId" @submit.prevent="addRoomUser">
|
14 | 12 | <input v-model="invitedUsername" type="text" placeholder="Add username" />
|
15 | 13 | <button type="submit" :disabled="disableForm || !invitedUsername">
|
16 | 14 | Add User
|
17 | 15 | </button>
|
18 |
| - <button class="button-cancel" @click="inviteRoomId = null"> |
19 |
| - Cancel |
20 |
| - </button> |
| 16 | + <button class="button-cancel" @click="inviteRoomId = null">Cancel</button> |
21 | 17 | </form>
|
22 | 18 |
|
23 | 19 | <form v-if="removeRoomId" @submit.prevent="deleteRoomUser">
|
24 | 20 | <select v-model="removeUserId">
|
25 |
| - <option default value=""> |
26 |
| - Select User |
27 |
| - </option> |
| 21 | + <option default value="">Select User</option> |
28 | 22 | <option v-for="user in removeUsers" :key="user._id" :value="user._id">
|
29 | 23 | {{ user.username }}
|
30 | 24 | </option>
|
31 | 25 | </select>
|
32 | 26 | <button type="submit" :disabled="disableForm || !removeUserId">
|
33 | 27 | Remove User
|
34 | 28 | </button>
|
35 |
| - <button class="button-cancel" @click="removeRoomId = null"> |
36 |
| - Cancel |
37 |
| - </button> |
| 29 | + <button class="button-cancel" @click="removeRoomId = null">Cancel</button> |
38 | 30 | </form>
|
39 | 31 |
|
40 | 32 | <vue-advanced-chat
|
41 | 33 | ref="chatWindow"
|
42 |
| - .height="screenHeight" |
43 |
| - .theme="theme" |
44 |
| - .styles="styles" |
45 |
| - .current-user-id="currentUserId" |
46 |
| - .room-id="roomId" |
47 |
| - .rooms="loadedRooms" |
48 |
| - .loading-rooms="loadingRooms" |
49 |
| - .messages="messages" |
50 |
| - .messages-loaded="messagesLoaded" |
51 |
| - .rooms-loaded="roomsLoaded" |
| 34 | + :height="screenHeight" |
| 35 | + :theme="theme" |
| 36 | + :styles="styles" |
| 37 | + :current-user-id="currentUserId" |
| 38 | + :room-id="roomId" |
| 39 | + :rooms="loadedRooms" |
| 40 | + :loading-rooms="loadingRooms" |
| 41 | + :rooms-loaded="roomsLoaded" |
| 42 | + :messages="messages" |
| 43 | + :messages-loaded="messagesLoaded" |
| 44 | + :room-message="roomMessage" |
52 | 45 | .room-actions="roomActions"
|
53 | 46 | .menu-actions="menuActions"
|
54 | 47 | .message-selection-actions="messageSelectionActions"
|
55 |
| - .room-message="roomMessage" |
56 | 48 | .templates-text="templatesText"
|
57 | 49 | @fetch-more-rooms="fetchMoreRooms"
|
58 | 50 | @fetch-messages="fetchMessages($event.detail[0])"
|
|
69 | 61 | "
|
70 | 62 | @send-message-reaction="sendMessageReaction($event.detail[0])"
|
71 | 63 | @typing-message="typingMessage($event.detail[0])"
|
72 |
| - @toggle-rooms-list="$emit('show-demo-options', $event.opened)" |
| 64 | + @toggle-rooms-list="$emit('show-demo-options', $event.detail[0].opened)" |
73 | 65 | >
|
74 | 66 | <!-- <template #emoji-picker="{ emojiOpened, addEmoji }">
|
75 | 67 | <button @click="addEmoji({ unicode: '😁' })">
|
@@ -390,7 +382,9 @@ export default {
|
390 | 382 | if (this.selectedRoom !== room.roomId) return
|
391 | 383 |
|
392 | 384 | if (data.length === 0 || data.length < this.messagesPerPage) {
|
393 |
| - setTimeout(() => (this.messagesLoaded = true), 0) |
| 385 | + setTimeout(() => { |
| 386 | + this.messagesLoaded = true |
| 387 | + }, 0) |
394 | 388 | }
|
395 | 389 |
|
396 | 390 | if (options.reset) this.messages = []
|
|
0 commit comments