diff options
author | Julius Härtl <jus@bitgrid.net> | 2022-08-30 08:53:12 +0200 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2022-08-31 15:51:12 +0200 |
commit | 964377ea92b167ec53d92f64b5580fe0a84e82b8 (patch) | |
tree | 10cfe1efb8c190888737dbb156929bedae7fccf6 | |
parent | 43b63b9f3bd3459c55e9706990c7d3d6fd8a96b8 (diff) |
Move to @nextcloud/vue-richtext
Signed-off-by: Julius Härtl <jus@bitgrid.net>
-rw-r--r-- | package-lock.json | 94 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | src/components/LobbyScreen.vue | 2 | ||||
-rw-r--r-- | src/components/MessagesList/MessagesGroup/Message/Message.vue | 9 | ||||
-rw-r--r-- | src/components/Quote.vue | 2 |
5 files changed, 59 insertions, 50 deletions
diff --git a/package-lock.json b/package-lock.json index 2a06c15df..5d84ce805 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "15.0.0", "license": "agpl", "dependencies": { - "@juliushaertl/vue-richtext": "^2.0.0-dev.0", "@nextcloud/auth": "^2.0.0", "@nextcloud/axios": "^2.0.0", "@nextcloud/browser-storage": "^0.1.1", @@ -65,6 +64,7 @@ "@nextcloud/browserslist-config": "^2.3.0", "@nextcloud/eslint-config": "^8.1.2", "@nextcloud/stylelint-config": "^2.2.0", + "@nextcloud/vue-richtext": "^2.0.0", "@nextcloud/webpack-vue-config": "^5.3.0", "@vue/cli-plugin-unit-jest": "^5.0.8", "@vue/cli-service": "^5.0.8", @@ -2444,32 +2444,6 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, - "node_modules/@juliushaertl/vue-richtext": { - "version": "2.0.0-dev.0", - "resolved": "https://registry.npmjs.org/@juliushaertl/vue-richtext/-/vue-richtext-2.0.0-dev.0.tgz", - "integrity": "sha512-FN71IXhua3PMtRy87Tnh0mSaddKQGA+vL5vg06Tt5/MXhVTrZKI3AY2dT5hYfH8BdvLCHxtR3+IsjRhgC4H+uQ==", - "dependencies": { - "@nextcloud/axios": "^2.0.0", - "@nextcloud/router": "^2.0.0", - "clone": "^2.1.2", - "vue": "^2.7.8" - }, - "engines": { - "node": ">=14.0.0", - "npm": ">=7.0.0" - }, - "peerDependencies": { - "vue": "^2.7.8" - } - }, - "node_modules/@juliushaertl/vue-richtext/node_modules/clone": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", - "engines": { - "node": ">=0.8" - } - }, "node_modules/@nextcloud/auth": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.0.0.tgz", @@ -2984,6 +2958,34 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, + "node_modules/@nextcloud/vue-richtext": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.0.tgz", + "integrity": "sha512-Z/AbweVmIB8shWZVLI0kUPrJnkCBlU5xIkkfv+RPFepLY7eZ+ttm5HRhLGqgFyXFNf4RIM7yGt/l6K35XcEX2A==", + "dev": true, + "dependencies": { + "@nextcloud/axios": "^2.0.0", + "@nextcloud/router": "^2.0.0", + "clone": "^2.1.2", + "vue": "^2.7.8" + }, + "engines": { + "node": ">=14.0.0", + "npm": ">=7.0.0" + }, + "peerDependencies": { + "vue": "^2.7.8" + } + }, + "node_modules/@nextcloud/vue-richtext/node_modules/clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", + "dev": true, + "engines": { + "node": ">=0.8" + } + }, "node_modules/@nextcloud/vue/node_modules/@babel/polyfill": { "version": "7.12.1", "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz", @@ -27990,24 +27992,6 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, - "@juliushaertl/vue-richtext": { - "version": "2.0.0-dev.0", - "resolved": "https://registry.npmjs.org/@juliushaertl/vue-richtext/-/vue-richtext-2.0.0-dev.0.tgz", - "integrity": "sha512-FN71IXhua3PMtRy87Tnh0mSaddKQGA+vL5vg06Tt5/MXhVTrZKI3AY2dT5hYfH8BdvLCHxtR3+IsjRhgC4H+uQ==", - "requires": { - "@nextcloud/axios": "^2.0.0", - "@nextcloud/router": "^2.0.0", - "clone": "^2.1.2", - "vue": "^2.7.8" - }, - "dependencies": { - "clone": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==" - } - } - }, "@nextcloud/auth": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.0.0.tgz", @@ -28491,6 +28475,26 @@ } } }, + "@nextcloud/vue-richtext": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@nextcloud/vue-richtext/-/vue-richtext-2.0.0.tgz", + "integrity": "sha512-Z/AbweVmIB8shWZVLI0kUPrJnkCBlU5xIkkfv+RPFepLY7eZ+ttm5HRhLGqgFyXFNf4RIM7yGt/l6K35XcEX2A==", + "dev": true, + "requires": { + "@nextcloud/axios": "^2.0.0", + "@nextcloud/router": "^2.0.0", + "clone": "^2.1.2", + "vue": "^2.7.8" + }, + "dependencies": { + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", + "dev": true + } + } + }, "@nextcloud/webpack-vue-config": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-5.3.0.tgz", diff --git a/package.json b/package.json index bdc4c900f..dbc5f914a 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,6 @@ "stylelint:fix": "stylelint css/*.css css/*.scss src/**/*.scss src/**/*.vue --fix" }, "dependencies": { - "@juliushaertl/vue-richtext": "^2.0.0-dev.0", "@nextcloud/auth": "^2.0.0", "@nextcloud/axios": "^2.0.0", "@nextcloud/browser-storage": "^0.1.1", @@ -73,6 +72,7 @@ "@nextcloud/browserslist-config": "^2.3.0", "@nextcloud/eslint-config": "^8.1.2", "@nextcloud/stylelint-config": "^2.2.0", + "@nextcloud/vue-richtext": "^2.0.0", "@nextcloud/webpack-vue-config": "^5.3.0", "@vue/cli-plugin-unit-jest": "^5.0.8", "@vue/cli-service": "^5.0.8", diff --git a/src/components/LobbyScreen.vue b/src/components/LobbyScreen.vue index 7b7a9490d..ed936711d 100644 --- a/src/components/LobbyScreen.vue +++ b/src/components/LobbyScreen.vue @@ -49,7 +49,7 @@ <script> import moment from '@nextcloud/moment' -import RichText from '@juliushaertl/vue-richtext' +import RichText from '@nextcloud/vue-richtext' import SetGuestUsername from './SetGuestUsername.vue' import Lobby from './missingMaterialDesignIcons/Lobby.vue' diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue index 68c60c584..6a650f8c0 100644 --- a/src/components/MessagesList/MessagesGroup/Message/Message.vue +++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue @@ -187,7 +187,7 @@ import DeckCard from './MessagePart/DeckCard.vue' import DefaultParameter from './MessagePart/DefaultParameter.vue' import FilePreview from './MessagePart/FilePreview.vue' import Mention from './MessagePart/Mention.vue' -import RichText from '@juliushaertl/vue-richtext' +import RichText from '@nextcloud/vue-richtext' import AlertCircle from 'vue-material-design-icons/AlertCircle.vue' import Check from 'vue-material-design-icons/Check.vue' import CheckAll from 'vue-material-design-icons/CheckAll.vue' @@ -811,7 +811,7 @@ export default { </script> <style lang="scss" scoped> -@import '@juliushaertl/vue-richtext/dist/style.css'; +@import '@nextcloud/vue-richtext/dist/style.css'; @import '../../../../assets/variables'; .message:hover .normal-message-body { @@ -837,6 +837,7 @@ export default { min-width: 100%; &__text { flex: 0 1 600px; + max-width: 600px; color: var(--color-text-light); .single-emoji { font-size: 250%; @@ -867,6 +868,10 @@ export default { ::v-deep .rich-text--wrapper { white-space: pre-wrap; word-break: break-word; + + .rich-text--reference-widget { + width: calc(100% + 132px); + } } &--quote { diff --git a/src/components/Quote.vue b/src/components/Quote.vue index eb868f1a6..dd361b6e7 100644 --- a/src/components/Quote.vue +++ b/src/components/Quote.vue @@ -59,7 +59,7 @@ components. <script> import NcButton from '@nextcloud/vue/dist/Components/NcButton.js' import Close from 'vue-material-design-icons/Close.vue' -import RichText from '@juliushaertl/vue-richtext' +import RichText from '@nextcloud/vue-richtext' import FilePreview from './MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue' import DefaultParameter from './MessagesList/MessagesGroup/Message/MessagePart/DefaultParameter.vue' import { EventBus } from '../services/EventBus.js' |