diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 21:14:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 21:14:27 +0300 |
commit | f6c037b73c90ac251625c17720e6b8307c1698cc (patch) | |
tree | 26a287a09ae414da75f7e383dd1eaae5d3704ca5 /app/assets/javascripts/dropzone_input.js | |
parent | bf0d6692fc4c16205cc49b8b87b7b7e0daa97c63 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/dropzone_input.js')
-rw-r--r-- | app/assets/javascripts/dropzone_input.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/dropzone_input.js b/app/assets/javascripts/dropzone_input.js index f404fa4e0e8..7c7127dfa44 100644 --- a/app/assets/javascripts/dropzone_input.js +++ b/app/assets/javascripts/dropzone_input.js @@ -44,6 +44,7 @@ export default function dropzoneInput(form, config = { parallelUploads: 2 }) { let addFileToForm; let updateAttachingMessage; let uploadFile; + let hasPlainText; formTextarea.wrap('<div class="div-dropzone"></div>'); formTextarea.on('paste', (event) => handlePaste(event)); @@ -184,7 +185,7 @@ export default function dropzoneInput(form, config = { parallelUploads: 2 }) { event.preventDefault(); const text = converter.convertToTableMarkdown(); pasteText(text); - } else { + } else if (!hasPlainText(pasteEvent)) { const fileList = [...clipboardData.files]; fileList.forEach((file) => { if (file.type.indexOf('image') !== -1) { @@ -203,6 +204,11 @@ export default function dropzoneInput(form, config = { parallelUploads: 2 }) { } }; + hasPlainText = (data) => { + const clipboardDataList = [...data.clipboardData.items]; + return clipboardDataList.some((item) => item.type === 'text/plain'); + }; + pasteText = (text, shouldPad) => { let formattedText = text; if (shouldPad) { |