ami/tl-vikunja
1
0
Fork 0
Code

fix(editor): image paste handling

Browse Source
This commit is contained in:
kolaente 2023-11-21 13:23:05 +01:00
parent c3e53970de
commit f45303c2e3
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/input/editor/TipTap.vue
View File

@ -493,14 +493,20 @@ function setLink() {
onMounted(() => {
internalMode.value = initialMode
document.addEventListener('paste', handleImagePaste)
nextTick(() => {
const input = tiptapInstanceRef.value.querySelectorAll('.tiptap__editor')[0].children[0]
input.addEventListener('paste', handleImagePaste)
})
if (editShortcut !== '') {
document.addEventListener('keydown', setFocusToEditor)
}
})
onBeforeUnmount(() => {
document.removeEventListener('paste', handleImagePaste)
nextTick(() => {
const input = tiptapInstanceRef.value.querySelectorAll('.tiptap__editor')[0].children[0]
input.removeEventListener('paste', handleImagePaste)
})
if (editShortcut !== '') {
document.removeEventListener('keydown', setFocusToEditor)
}
@ -510,11 +516,12 @@ function handleImagePaste(event) {
if (event?.clipboardData?.items?.length === 0) {
return
}
event.preventDefault()
const image = event.clipboardData.items[0]
if (image.kind === 'file' && image.type.startsWith('image/')) {
console.log('img', image.getAsFile())
uploadAndInsertFiles([image.getAsFile()])
}
}

24
src/components/tasks/partials/comments.vue
View File

@ -218,13 +218,19 @@ const actions = computed(() => {
])))
})
function attachmentUpload(
file: File,
onSuccess: (url: string) => void,
// eslint-disable-next-line @typescript-eslint/no-unused-vars
onError: (error: string) => void,
) {
return uploadFile(props.taskId, file, onSuccess)
async function attachmentUpload(files: File[] | FileList): (Promise<string[]>) {
const uploadPromises: Promise<string>[] = []
files.forEach((file: File) => {
const promise = new Promise<string>((resolve) => {
uploadFile(props.taskId, file, (uploadedFileUrl: string) => resolve(uploadedFileUrl))
})
uploadPromises.push(promise)
})
return await Promise.all(uploadPromises)
}
const taskCommentService = shallowReactive(new TaskCommentService())
@ -299,7 +305,7 @@ async function editComment() {
if (commentEdit.comment === '') {
return
}
if (changeTimeout.value !== null) {
clearTimeout(changeTimeout.value)
}
@ -368,7 +374,7 @@ async function deleteComment(commentToDelete: ITaskComment) {
}
.image.is-avatar {
border-radius: 100%;
border-radius: 100%;
}
.media-content {