cleanup: drop richTextOptions and currentDirectory

We now provide $imageResolver to lookup images.

Signed-off-by: Max <max@nextcloud.com>

8 files changed, 3 insertions, 21 deletions

diff --git a/src/EditorFactory.js b/src/EditorFactory.js
index 85bd0af16..b0b857e02 100644
--- a/src/EditorFactory.js
+++ b/src/EditorFactory.js
@@ -52,12 +52,12 @@ const loadSyntaxHighlight = async (language) => {
 	}
 }
 
-const createEditor = ({ content, onCreate, onUpdate, extensions, enableRichEditing, currentDirectory }) => {
+const createEditor = ({ content, onCreate, onUpdate, extensions, enableRichEditing }) => {
 	let richEditingExtensions = []
 	if (enableRichEditing) {
 		richEditingExtensions = [
 			Markdown,
-			RichText.configure({ currentDirectory }),
+			RichText,
 			Emoji.configure({
 				suggestion: {
 					items: ({ query }) => {
diff --git a/src/components/EditorWrapper.vue b/src/components/EditorWrapper.vue
index 053916254..56e6925f2 100644
--- a/src/components/EditorWrapper.vue
+++ b/src/components/EditorWrapper.vue
@@ -296,11 +296,6 @@ export default {
 		isRichEditor() {
 			return this.mime === 'text/markdown'
 		},
-		richTextOptions() {
-			return {
-				currentDirectory: this.currentDirectory,
-			}
-		},
 		fileExtension() {
 			return this.relativePath ? this.relativePath.split('/').pop().split('.').pop() : 'txt'
 		},
diff --git a/src/components/PlaintextReader.vue b/src/components/PlaintextReader.vue
index 5f3f52acf..7c18fcccc 100644
--- a/src/components/PlaintextReader.vue
+++ b/src/components/PlaintextReader.vue
@@ -38,10 +38,6 @@ export default {
 			type: String,
 			required: true,
 		},
-		richTextOptions: {
-			type: Object,
-			default: () => {},
-		},
 	},
 	data: () => {
 		return {
diff --git a/src/components/Reader.vue b/src/components/Reader.vue
index e79fb1759..191d197aa 100644
--- a/src/components/Reader.vue
+++ b/src/components/Reader.vue
@@ -22,7 +22,6 @@
 
 <template>
 	<RichtextReader v-if="isRichText"
-		:rich-text-options="richTextOptions"
 		:content="content" />
 	<PlaintextReader v-else
 		:content="content" />
diff --git a/src/components/RichtextReader.vue b/src/components/RichtextReader.vue
index d30860b90..34b6dbb6a 100644
--- a/src/components/RichtextReader.vue
+++ b/src/components/RichtextReader.vue
@@ -38,10 +38,6 @@ export default {
 			type: String,
 			required: true,
 		},
-		richTextOptions: {
-			type: Object,
-			default: () => {},
-		},
 	},
 	data: () => {
 		return {
@@ -76,7 +72,6 @@ export default {
 				content: this.htmlContent,
 				extensions: [
 					RichText.configure({
-						...this.richTextOptions,
 						link: {
 							onClick: (event, attrs) => this.$emit('click-link', event, attrs),
 						},
diff --git a/src/extensions/RichText.js b/src/extensions/RichText.js
index ce8931371..56913dd31 100644
--- a/src/extensions/RichText.js
+++ b/src/extensions/RichText.js
@@ -57,7 +57,6 @@ export default Extension.create({
 
 	addOptions() {
 		return {
-			currentDirectory: undefined,
 			link: {},
 		}
 	},
@@ -89,7 +88,6 @@ export default Extension.create({
 			Callout,
 			Underline,
 			Image.configure({
-				currentDirectory: this.options.currentDirectory,
 				inline: true,
 			}),
 			Dropcursor,
diff --git a/src/nodes/Image.js b/src/nodes/Image.js
index b772291b5..78470f670 100644
--- a/src/nodes/Image.js
+++ b/src/nodes/Image.js
@@ -32,7 +32,6 @@ const Image = TiptapImage.extend({
 	addOptions() {
 		return {
 			...this.parent?.(),
-			currentDirectory: undefined,
 		}
 	},
 
diff --git a/src/services/ImageResolver.js b/src/services/ImageResolver.js
index eec02ea7c..d3bf300fc 100644
--- a/src/services/ImageResolver.js
+++ b/src/services/ImageResolver.js
@@ -147,7 +147,7 @@ export default class ImageResolver {
 		if (src.startsWith('text://')) {
 			return [
 				this.#attachmentDirectory,
-				getQueryVariable(src, 'imageFileName')
+				getQueryVariable(src, 'imageFileName'),
 			].join('/')
 		}
 		return decodeURI(src.split('?')[0])