diff options
| -rw-r--r-- | jest.config.js | 1 | ||||
| -rw-r--r-- | src/components/LobbyScreen.vue | 6 | ||||
| -rw-r--r-- | src/components/MessagesList/MessagesGroup/Message/Message.vue | 13 | ||||
| -rw-r--r-- | src/components/Quote.vue | 6 | ||||
| -rw-r--r-- | webpack.config.js | 1 |
5 files changed, 12 insertions, 15 deletions
diff --git a/jest.config.js b/jest.config.js index db2678301..8d47f52b5 100644 --- a/jest.config.js +++ b/jest.config.js @@ -24,7 +24,6 @@ const ignorePatterns = [ 'vue-material-design-icons', '@juliushaertl', - '@nextcloud/vue-richtext', 'tributejs', '@nextcloud/vue', 'splitpanes', diff --git a/src/components/LobbyScreen.vue b/src/components/LobbyScreen.vue index 5ca8d4594..ba1d0cb2c 100644 --- a/src/components/LobbyScreen.vue +++ b/src/components/LobbyScreen.vue @@ -39,7 +39,7 @@ </p> <p class="lobby__description"> - <RichText :text="conversation.description" + <NcRichText :text="conversation.description" :autolink="true" /> </p> </div> @@ -49,7 +49,7 @@ <script> import moment from '@nextcloud/moment' -import RichText from '@nextcloud/vue-richtext' +import NcRichText from '@nextcloud/vue/dist/Components/NcRichText.js' import Lobby from './missingMaterialDesignIcons/Lobby.vue' import SetGuestUsername from './SetGuestUsername.vue' @@ -60,7 +60,7 @@ export default { components: { SetGuestUsername, - RichText, + NcRichText, Lobby, }, diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue index 86859f829..d0b6697d9 100644 --- a/src/components/MessagesList/MessagesGroup/Message/Message.vue +++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue @@ -52,14 +52,14 @@ the main body of the message as well as a quote. </div> </div> <div v-else-if="showJoinCallButton" class="message-body__main__text call-started"> - <RichText :text="message" + <NcRichText :text="message" :arguments="richParameters" :autolink="true" :reference-limit="0" /> <CallButton /> </div> <div v-else-if="showResultsButton" class="message-body__main__text system-message"> - <RichText :text="message" + <NcRichText :text="message" :arguments="richParameters" :autolink="true" :reference-limit="0" /> @@ -70,14 +70,14 @@ the main body of the message as well as a quote. :show-as-button="true" /> </div> <div v-else-if="isDeletedMessage" class="message-body__main__text deleted-message"> - <RichText :text="message" + <NcRichText :text="message" :arguments="richParameters" :autolink="true" :reference-limit="0" /> </div> <div v-else class="message-body__main__text" :class="{'system-message': isSystemMessage}"> <Quote v-if="parent" :parent-id="parent" v-bind="quote" /> - <RichText :text="message" + <NcRichText :text="message" :arguments="richParameters" :autolink="true" :reference-limit="1" /> @@ -208,7 +208,7 @@ import Reload from 'vue-material-design-icons/Reload.vue' import { showError, showSuccess, showWarning, TOAST_DEFAULT_TIMEOUT } from '@nextcloud/dialogs' import moment from '@nextcloud/moment' -import RichText from '@nextcloud/vue-richtext' +import NcRichText from '@nextcloud/vue/dist/Components/NcRichText.js' import NcButton from '@nextcloud/vue/dist/Components/NcButton.js' import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js' @@ -240,7 +240,7 @@ export default { NcButton, CallButton, Quote, - RichText, + NcRichText, AlertCircle, Check, CheckAll, @@ -853,7 +853,6 @@ export default { </script> <style lang="scss" scoped> -@import '@nextcloud/vue-richtext/dist/style.css'; @import '../../../../assets/variables'; .message:hover .normal-message-body { diff --git a/src/components/Quote.vue b/src/components/Quote.vue index 5887a4aa4..274995d1e 100644 --- a/src/components/Quote.vue +++ b/src/components/Quote.vue @@ -38,7 +38,7 @@ components. </div> <div v-if="isFileShareMessage" class="quote__main__text"> - <RichText :text="message" + <NcRichText :text="message" :arguments="richParameters" :autolink="true" /> </div> @@ -62,7 +62,7 @@ components. <script> import Close from 'vue-material-design-icons/Close.vue' -import RichText from '@nextcloud/vue-richtext' +import NcRichText from '@nextcloud/vue/dist/Components/NcRichText.js' import NcButton from '@nextcloud/vue/dist/Components/NcButton.js' @@ -76,7 +76,7 @@ export default { components: { NcButton, Close, - RichText, + NcRichText, }, props: { actorId: { diff --git a/webpack.config.js b/webpack.config.js index e11f5f7db..45050c80f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -24,7 +24,6 @@ webpackConfig.output.assetModuleFilename = '[name][ext]?v=[contenthash]' // Edit JS rule webpackRules.RULE_JS.exclude = BabelLoaderExcludeNodeModulesExcept([ - '@nextcloud/vue-richtext', '@nextcloud/event-bus', 'ansi-regex', 'color.js', |