summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/components/BreakoutRoomsEditor/SendMessageDialog.vue12
-rw-r--r--src/components/ChatView.vue8
-rw-r--r--src/components/NewMessage/NewMessage.vue (renamed from src/components/NewMessageForm/NewMessageForm.vue)42
-rw-r--r--src/components/NewMessage/NewMessageAttachments.vue (renamed from src/components/NewMessageForm/NewMessageFormAttachments.vue)2
-rw-r--r--src/components/NewMessage/NewMessageAudioRecorder.vue (renamed from src/components/NewMessageForm/NewMessageFormAudioRecorder.vue)4
-rw-r--r--src/components/NewMessage/NewMessageNewFileDialog.vue (renamed from src/components/NewMessageForm/NewMessageFormTextCreateDialog.vue)8
-rw-r--r--src/components/NewMessage/NewMessagePollEditor.vue (renamed from src/components/NewMessageForm/NewMessageFormPollEditor.vue)2
-rw-r--r--src/components/NewMessage/NewMessageTemplatePreview.vue (renamed from src/components/NewMessageForm/NewMessageFormTemplatePreview.vue)2
-rw-r--r--src/components/NewMessage/NewMessageTypingIndicator.vue (renamed from src/components/NewMessageForm/NewMessageFormTypingIndicator.vue)5
-rw-r--r--src/components/NewMessage/NewMessageUploadEditor.vue (renamed from src/components/NewMessageForm/NewMessageFormUploadEditor.vue)4
-rw-r--r--src/components/Quote.vue8
-rw-r--r--src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue8
12 files changed, 53 insertions, 52 deletions
diff --git a/src/components/BreakoutRoomsEditor/SendMessageDialog.vue b/src/components/BreakoutRoomsEditor/SendMessageDialog.vue
index 5d7c1682b..05c11c2c6 100644
--- a/src/components/BreakoutRoomsEditor/SendMessageDialog.vue
+++ b/src/components/BreakoutRoomsEditor/SendMessageDialog.vue
@@ -27,8 +27,8 @@
<h2 class="send-message-dialog__title">
{{ dialogTitle }}
</h2>
- <NewMessageForm v-if="modalContainerId"
- ref="messageForm"
+ <NewMessage v-if="modalContainerId"
+ ref="newMessage"
role="region"
:token="token"
:container="modalContainerId"
@@ -45,14 +45,14 @@ import { showError, showSuccess } from '@nextcloud/dialogs'
import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
-import NewMessageForm from '../NewMessageForm/NewMessageForm.vue'
+import NewMessage from '../NewMessage/NewMessage.vue'
export default {
name: 'SendMessageDialog',
components: {
NcModal,
- NewMessageForm,
+ NewMessage,
},
props: {
@@ -104,10 +104,10 @@ export default {
},
mounted() {
- // Postpone render of NewMessageForm until modal container is mounted
+ // Postpone render of NewMessage until modal container is mounted
this.modalContainerId = `#modal-description-${this.$refs.modal.randId}`
this.$nextTick(() => {
- this.$refs.messageForm.focusInput()
+ this.$refs.newMessage.focusInput()
})
},
diff --git a/src/components/ChatView.vue b/src/components/ChatView.vue
index f494a018d..c0a2727ad 100644
--- a/src/components/ChatView.vue
+++ b/src/components/ChatView.vue
@@ -42,7 +42,7 @@
:aria-label="t('spreed', 'Conversation messages')"
:token="token"
:is-visible="isVisible" />
- <NewMessageForm v-if="containerId"
+ <NewMessage v-if="containerId"
role="region"
:token="token"
:container="containerId"
@@ -53,7 +53,7 @@
<script>
import MessagesList from './MessagesList/MessagesList.vue'
-import NewMessageForm from './NewMessageForm/NewMessageForm.vue'
+import NewMessage from './NewMessage/NewMessage.vue'
import { CONVERSATION } from '../constants.js'
@@ -63,7 +63,7 @@ export default {
components: {
MessagesList,
- NewMessageForm,
+ NewMessage,
},
props: {
@@ -106,7 +106,7 @@ export default {
},
},
mounted() {
- // Postpone render of NewMessageForm until application is mounted
+ // Postpone render of NewMessage until application is mounted
this.containerId = this.$store.getters.getMainContainerSelector()
},
diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessage/NewMessage.vue
index 51e9429e4..dab30f8e6 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -23,7 +23,7 @@
<template>
<div class="wrapper" :class="{'wrapper--has-typing-indicator': showTypingStatus}">
- <NewMessageFormTypingIndicator v-if="showTypingStatus"
+ <NewMessageTypingIndicator v-if="showTypingStatus"
:token="token" />
<!--native file picker, hidden -->
@@ -40,7 +40,7 @@
<form class="new-message-form"
@submit.prevent>
<!-- Attachments menu -->
- <NewMessageFormAttachments v-if="showAttachmentsMenu"
+ <NewMessageAttachments v-if="showAttachmentsMenu"
:token="token"
:container="container"
:boundaries-element="containerElement"
@@ -80,7 +80,7 @@
</NcButton>
</div>
<div v-if="messageToBeReplied" class="new-message-form__quote">
- <Quote :is-new-message-form-quote="true"
+ <Quote is-new-message-quote
:parent-id="messageToBeReplied.id"
v-bind="messageToBeReplied" />
</div>
@@ -103,7 +103,7 @@
</div>
<!-- Audio recorder -->
- <NewMessageFormAudioRecorder v-if="showAudioRecorder"
+ <NewMessageAudioRecorder v-if="showAudioRecorder"
:disabled="disabled"
@recording="handleRecording"
@audio-file="handleAudioFile" />
@@ -140,15 +140,15 @@
</div>
<!-- File upload dialog -->
- <NewMessageFormUploadEditor />
+ <NewMessageUploadEditor />
<!-- Poll creation dialog -->
- <NewMessageFormPollEditor v-if="showPollEditor"
+ <NewMessagePollEditor v-if="showPollEditor"
:token="token"
@close="togglePollEditor" />
- <!-- Text file creation dialog -->
- <NewMessageFormTextCreateDialog v-if="showNewFileDialog !== -1"
+ <!-- New file creation dialog -->
+ <NewMessageNewFileDialog v-if="showNewFileDialog !== -1"
:token="token"
:container="container"
:show-new-file-dialog="showNewFileDialog"
@@ -172,12 +172,12 @@ import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
import NcRichContenteditable from '@nextcloud/vue/dist/Components/NcRichContenteditable.js'
import Quote from '../Quote.vue'
-import NewMessageFormAttachments from './NewMessageFormAttachments.vue'
-import NewMessageFormAudioRecorder from './NewMessageFormAudioRecorder.vue'
-import NewMessageFormPollEditor from './NewMessageFormPollEditor.vue'
-import NewMessageFormTextCreateDialog from './NewMessageFormTextCreateDialog.vue'
-import NewMessageFormTypingIndicator from './NewMessageFormTypingIndicator.vue'
-import NewMessageFormUploadEditor from './NewMessageFormUploadEditor.vue'
+import NewMessageAttachments from './NewMessageAttachments.vue'
+import NewMessageAudioRecorder from './NewMessageAudioRecorder.vue'
+import NewMessageNewFileDialog from './NewMessageNewFileDialog.vue'
+import NewMessagePollEditor from './NewMessagePollEditor.vue'
+import NewMessageTypingIndicator from './NewMessageTypingIndicator.vue'
+import NewMessageUploadEditor from './NewMessageUploadEditor.vue'
import { useViewer } from '../../composables/useViewer.js'
import { CONVERSATION, PARTICIPANT, PRIVACY } from '../../constants.js'
@@ -197,7 +197,7 @@ const disableKeyboardShortcuts = OCP.Accessibility.disableKeyboardShortcuts()
const supportTypingStatus = getCapabilities()?.spreed?.config?.chat?.['typing-privacy'] !== undefined
export default {
- name: 'NewMessageForm',
+ name: 'NewMessage',
disableKeyboardShortcuts,
@@ -207,12 +207,12 @@ export default {
NcButton,
NcEmojiPicker,
NcRichContenteditable,
- NewMessageFormAttachments,
- NewMessageFormAudioRecorder,
- NewMessageFormPollEditor,
- NewMessageFormTextCreateDialog,
- NewMessageFormTypingIndicator,
- NewMessageFormUploadEditor,
+ NewMessageAttachments,
+ NewMessageAudioRecorder,
+ NewMessageNewFileDialog,
+ NewMessagePollEditor,
+ NewMessageTypingIndicator,
+ NewMessageUploadEditor,
Quote,
// Icons
BellOff,
diff --git a/src/components/NewMessageForm/NewMessageFormAttachments.vue b/src/components/NewMessage/NewMessageAttachments.vue
index be0b6e1b0..f9bb1f06a 100644
--- a/src/components/NewMessageForm/NewMessageFormAttachments.vue
+++ b/src/components/NewMessage/NewMessageAttachments.vue
@@ -91,7 +91,7 @@ const picker = getFilePickerBuilder(t('spreed', 'File to share'))
.build()
export default {
- name: 'NewMessageFormAttachments',
+ name: 'NewMessageAttachments',
components: {
NcActionButton,
diff --git a/src/components/NewMessageForm/NewMessageFormAudioRecorder.vue b/src/components/NewMessage/NewMessageAudioRecorder.vue
index f3f059622..b09a7d255 100644
--- a/src/components/NewMessageForm/NewMessageFormAudioRecorder.vue
+++ b/src/components/NewMessage/NewMessageAudioRecorder.vue
@@ -82,7 +82,7 @@ import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
import { mediaDevicesManager } from '../../utils/webrtc/index.js'
export default {
- name: 'NewMessageFormAudioRecorder',
+ name: 'NewMessageAudioRecorder',
components: {
Microphone,
@@ -255,7 +255,7 @@ export default {
}
this.recordTime.seconds++
}, 1000)
- // Forward an event to let the parent NewMessageForm component
+ // Forward an event to let the parent NewMessage component
// that there's an undergoing recording operation
this.$emit('recording', true)
},
diff --git a/src/components/NewMessageForm/NewMessageFormTextCreateDialog.vue b/src/components/NewMessage/NewMessageNewFileDialog.vue
index f127ec5e9..6033a0865 100644
--- a/src/components/NewMessageForm/NewMessageFormTextCreateDialog.vue
+++ b/src/components/NewMessage/NewMessageNewFileDialog.vue
@@ -43,7 +43,7 @@
@update:value="updateNewFileTitle" />
<ul v-if="templates.length > 1" class="templates-picker__list">
- <NewMessageFormTemplatePreview v-for="template in templates"
+ <NewMessageTemplatePreview v-for="template in templates"
:key="template.fileid"
:basename="template.basename"
:checked="checked === template.fileid"
@@ -74,17 +74,17 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
-import NewMessageFormTemplatePreview from './NewMessageFormTemplatePreview.vue'
+import NewMessageTemplatePreview from './NewMessageTemplatePreview.vue'
import { useViewer } from '../../composables/useViewer.js'
import { createNewFile, shareFile } from '../../services/filesSharingServices.js'
export default {
- name: 'NewMessageFormTextCreateDialog',
+ name: 'NewMessageNewFileDialog',
components: {
NcButton,
- NewMessageFormTemplatePreview,
+ NewMessageTemplatePreview,
NcModal,
NcTextField,
},
diff --git a/src/components/NewMessageForm/NewMessageFormPollEditor.vue b/src/components/NewMessage/NewMessagePollEditor.vue
index 83f8b887b..7c47135ac 100644
--- a/src/components/NewMessageForm/NewMessageFormPollEditor.vue
+++ b/src/components/NewMessage/NewMessagePollEditor.vue
@@ -99,7 +99,7 @@ import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
import pollService from '../../services/pollService.js'
export default {
- name: 'NewMessageFormPollEditor',
+ name: 'NewMessagePollEditor',
components: {
NcCheckBoxRadioSwitch,
diff --git a/src/components/NewMessageForm/NewMessageFormTemplatePreview.vue b/src/components/NewMessage/NewMessageTemplatePreview.vue
index 34410cbb0..832753eff 100644
--- a/src/components/NewMessageForm/NewMessageFormTemplatePreview.vue
+++ b/src/components/NewMessage/NewMessageTemplatePreview.vue
@@ -74,7 +74,7 @@ const getToken = function() {
const previewWidth = 256
export default {
- name: 'NewMessageFormTemplatePreview',
+ name: 'NewMessageTemplatePreview',
inheritAttrs: false,
props: {
diff --git a/src/components/NewMessageForm/NewMessageFormTypingIndicator.vue b/src/components/NewMessage/NewMessageTypingIndicator.vue
index 05c2392f7..084e6691b 100644
--- a/src/components/NewMessageForm/NewMessageFormTypingIndicator.vue
+++ b/src/components/NewMessage/NewMessageTypingIndicator.vue
@@ -3,7 +3,7 @@
-
- @author Maksim Sukharev <antreesy.web@gmail.com>
-
- - @license GNU AGPL version 3 or any later version
+ - @license AGPL-3.0-or-later
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
@@ -34,6 +34,7 @@
disable-menu
disable-tooltip />
</div>
+ <!-- eslint-disable-next-line vue/no-v-html -->
<p class="indicator__main" v-html="indicatorMessage" />
</div>
</div>
@@ -45,7 +46,7 @@ import escapeHtml from 'escape-html'
import AvatarWrapper from '../AvatarWrapper/AvatarWrapper.vue'
export default {
- name: 'NewMessageFormTypingIndicator',
+ name: 'NewMessageTypingIndicator',
components: { AvatarWrapper },
props: {
diff --git a/src/components/NewMessageForm/NewMessageFormUploadEditor.vue b/src/components/NewMessage/NewMessageUploadEditor.vue
index 309a5f122..aaa72302d 100644
--- a/src/components/NewMessageForm/NewMessageFormUploadEditor.vue
+++ b/src/components/NewMessage/NewMessageUploadEditor.vue
@@ -3,7 +3,7 @@
-
- @author Marco Ambrosini <marcoambrosini@icloud.com>
-
- - @license GNU AGPL version 3 or any later version
+ - @license AGPL-3.0-or-later
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as
@@ -83,7 +83,7 @@ import AudioPlayer from '../MessagesList/MessagesGroup/Message/MessagePart/Audio
import FilePreview from '../MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue'
export default {
- name: 'NewMessageFormUploadEditor',
+ name: 'NewMessageUploadEditor',
components: {
NcModal,
diff --git a/src/components/Quote.vue b/src/components/Quote.vue
index 9338fe10a..988be27cb 100644
--- a/src/components/Quote.vue
+++ b/src/components/Quote.vue
@@ -20,7 +20,7 @@
-->
<docs>
-This component is intended to be used both in `NewMessageForm` and `Message`
+This component is intended to be used both in `NewMessage` and `Message`
components.
</docs>
@@ -47,7 +47,7 @@ components.
<p>{{ shortenedQuoteMessage }}</p>
</blockquote>
</div>
- <div v-if="isNewMessageFormQuote" class="quote__main__right">
+ <div v-if="isNewMessageQuote" class="quote__main__right">
<NcButton type="tertiary"
:aria-label="cancelQuoteLabel"
@click="handleAbortReply">
@@ -125,10 +125,10 @@ export default {
default: '',
},
/**
- * If the quote component is used in the `NewMessageForm` component we display
+ * If the quote component is used in the `NewMessage` component we display
* the remove button.
*/
- isNewMessageFormQuote: {
+ isNewMessageQuote: {
type: Boolean,
default: false,
},
diff --git a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue
index d88291283..67b943f8c 100644
--- a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue
+++ b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue
@@ -54,7 +54,7 @@
</template>
{{ t('spreed', 'Dismiss request for assistance') }}
</NcActionButton>
- <NcActionButton @click="openSendMessageForm">
+ <NcActionButton @click="openSendMessageDialog">
<template #icon>
<Send :size="16" />
</template>
@@ -65,7 +65,7 @@
<SendMessageDialog v-if="isDialogOpened"
:display-name="roomName"
:token="roomToken"
- @close="closeSendMessageForm" />
+ @close="closeSendMessageDialog" />
</template>
</div>
<ul v-show="showParticipants">
@@ -207,11 +207,11 @@ export default {
},
methods: {
- openSendMessageForm() {
+ openSendMessageDialog() {
this.isDialogOpened = true
},
- closeSendMessageForm() {
+ closeSendMessageDialog() {
this.isDialogOpened = false
},
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 16:36:24 +0000