diff options
author | Julien Veyssier <eneiluj@posteo.net> | 2022-08-29 14:46:07 +0300 |
---|---|---|
committer | Julien Veyssier <eneiluj@posteo.net> | 2022-09-06 15:44:54 +0300 |
commit | fc652996711384f695e97d42fe0b66a7bfaf7a44 (patch) | |
tree | fe4f975542ee4419c776cc614030a545ba4aea99 | |
parent | bf9728b6f4e7854e72f2f35eb3de4377d77bba57 (diff) |
move attachment resolver axios call to ImageView
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
-rw-r--r-- | src/nodes/ImageView.vue | 6 | ||||
-rw-r--r-- | src/services/AttachmentResolver.js | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/nodes/ImageView.vue b/src/nodes/ImageView.vue index 6176d6024..8a7220e23 100644 --- a/src/nodes/ImageView.vue +++ b/src/nodes/ImageView.vue @@ -117,6 +117,7 @@ <script> import { generateUrl } from '@nextcloud/router' +import axios from '@nextcloud/axios' import { NodeViewWrapper } from '@tiptap/vue-2' import ClickOutside from 'vue-click-outside' import { Image as ImageIcon, Delete as DeleteIcon } from '../components/icons.js' @@ -284,7 +285,10 @@ export default { }) }, loadMediaMetadata(name) { - return this.$attachmentResolver.getMediaMetadata(name).then((response) => { + const metadataUrl = this.$attachmentResolver.getMediaMetadataUrl(name) + console.debug('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', metadataUrl) + return axios.get(metadataUrl).then((response) => { + console.debug('response', response.data) this.attachmentMetadata = response.data }).catch((error) => { console.error(error) diff --git a/src/services/AttachmentResolver.js b/src/services/AttachmentResolver.js index 096cbbc68..f07bfd372 100644 --- a/src/services/AttachmentResolver.js +++ b/src/services/AttachmentResolver.js @@ -21,7 +21,6 @@ */ import { generateUrl, generateRemoteUrl } from '@nextcloud/router' -import axios from '@nextcloud/axios' import pathNormalize from 'path-normalize' export default class AttachmentResolver { @@ -47,7 +46,7 @@ export default class AttachmentResolver { /* * Resolve a given src. * @param { string } the original src in the node. - * @returns { Array<Array> } - resolved candidates to try. + * @returns { Array<Object> } - resolved candidates to try. * * Currently returns either one or two urls. */ @@ -153,7 +152,7 @@ export default class AttachmentResolver { }) } - #getMediaMetadataUrl(mediaFileName) { + getMediaMetadataUrl(mediaFileName) { if (this.#user || !this.#shareToken) { return generateUrl('/apps/text/mediaMetadata?documentId={documentId}&sessionId={sessionId}&sessionToken={sessionToken}&mediaFileName={mediaFileName}', { ...this.#textApiParams(), @@ -168,10 +167,6 @@ export default class AttachmentResolver { }) } - getMediaMetadata(mediaFileName) { - return axios.get(this.#getMediaMetadataUrl(mediaFileName)) - } - #textApiParams() { if (this.#session) { return { |