diff options
| author | Max <max@nextcloud.com> | 2022-06-01 15:00:53 +0300 |
|---|---|---|
| committer | Max <max@nextcloud.com> | 2022-06-07 20:42:05 +0300 |
| commit | b1ccb60cb6a0d9265e145f7db750add1e832e52d (patch) | |
| tree | 8cb8619565b0747380c39e8220913702a74fa4cc /src/components/Reader.vue | |
| parent | 36730c264a25b64347515a1e83a4ca0b1732896c (diff) | |
fix: various issues with conflict display
* only import prosemirror css once.
* disconnect after receiving a 409 response in polling backend.
* clean up remains of `RichtextOptions`.
* use the `isRichEditor` prop in Reader.
* add cypress test for conflict display.
Signed-off-by: Max <max@nextcloud.com>
Diffstat (limited to 'src/components/Reader.vue')
| -rw-r--r-- | src/components/Reader.vue | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/components/Reader.vue b/src/components/Reader.vue index 212e198d1..0532524b7 100644 --- a/src/components/Reader.vue +++ b/src/components/Reader.vue @@ -21,7 +21,7 @@ --> <template> - <RichTextReader v-if="isRichText" + <RichTextReader v-if="isRichEditor" :content="content" /> <PlainTextReader v-else :content="content" /> @@ -65,6 +65,3 @@ export default { } </style> -<style lang="scss"> - @import './../../css/prosemirror'; -</style> |