Merge pull request #4509 from nextcloud/backport/4503/stable26

nextcloud · Jul 12, 2023 · 3667fce · 3667fce
2 parents 0bb75e3 + bb269bc
commit 3667fce
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 25 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/files-modal.js b/js/files-modal.js
diff --git a/js/files-modal.js.map b/js/files-modal.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.map b/js/text-editors.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/components/Editor.vue b/src/components/Editor.vue
@@ -326,13 +326,17 @@ export default {
 		this.$syncService = null
 		this.$attachmentResolver = null
 	},
-	beforeDestroy() {
+	async beforeDestroy() {
 		if (!this.richWorkspace) {
 			window.removeEventListener('beforeprint', this.preparePrinting)
 			window.removeEventListener('afterprint', this.preparePrinting)
 		}
 		unsubscribe('text:image-node:add', this.onAddImageNode)
 		unsubscribe('text:image-node:delete', this.onDeleteImageNode)
+		if (this.dirty) {
+			const timeout = new Promise((resolve) => setTimeout(resolve, 2000))
+			await Promise.any([timeout, this.$syncService.save()])
+		}
 		this.$providers.forEach(p => p.destroy())
 	},
 	methods: {

diff --git a/src/services/SyncService.js b/src/services/SyncService.js
@@ -275,8 +275,6 @@ class SyncService {
 
 	async close() {
 		this.backend?.disconnect()
-		const timeout = new Promise((resolve) => setTimeout(resolve, 2000))
-		await Promise.any([timeout, this.save()])
 		return this._close()
 	}
 

diff --git a/src/views/DirectEditing.vue b/src/views/DirectEditing.vue
@@ -114,7 +114,7 @@ export default {
 		async close() {
 			this.saving = true
 			setTimeout(async () => {
-				await this.$refs.editor.close()
+				await this.$refs.editor.$destroy()
 				callMobileMessage('close')
 			}, 0)
 		},