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 | |
| 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')
| -rw-r--r-- | src/components/EditorWrapper.vue | 2 | ||||
| -rw-r--r-- | src/components/Reader.vue | 5 | ||||
| -rw-r--r-- | src/components/RichTextReader.vue | 4 | ||||
| -rw-r--r-- | src/services/PollingBackend.js | 1 |
4 files changed, 2 insertions, 10 deletions
diff --git a/src/components/EditorWrapper.vue b/src/components/EditorWrapper.vue index 56e6925f2..7b14178d6 100644 --- a/src/components/EditorWrapper.vue +++ b/src/components/EditorWrapper.vue @@ -77,7 +77,6 @@ </EditorMidiaHandler> <Reader v-if="hasSyncCollission" :content="syncError.data.outsideChange" - :rich-text-options="richTextOptions" :is-rich-editor="isRichEditor" /> </div> @@ -563,7 +562,6 @@ export default { }), ], enableRichEditing: this.isRichEditor, - ...this.richTextOptions, }) this.$editor.on('focus', () => { this.$emit('focus') 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> diff --git a/src/components/RichTextReader.vue b/src/components/RichTextReader.vue index 8107ad2f9..7982fdf09 100644 --- a/src/components/RichTextReader.vue +++ b/src/components/RichTextReader.vue @@ -55,7 +55,3 @@ export default { } </script> - -<style lang="scss"> - @import './../../css/prosemirror'; -</style> diff --git a/src/services/PollingBackend.js b/src/services/PollingBackend.js index 4aeb1a907..82db548e3 100644 --- a/src/services/PollingBackend.js +++ b/src/services/PollingBackend.js @@ -190,6 +190,7 @@ class PollingBackend { outsideChange: e.response.data.outsideChange, }, }) + this.disconnect() } else if (e.response.status === 403) { this._authority.emit('error', { type: ERROR_TYPE.SOURCE_NOT_FOUND, data: {} }) this.disconnect() |