Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-23 15:10:26 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-23 15:10:26 +0300
commit5c9f6c66fabf22927e862b2b60362e4ea25b250b (patch)
tree6ff391dcb7fdd3126f71af9fa4ca5e776a9ecbe3 /app/assets/javascripts/dropzone_input.js
parent65fdda8d39a9af414dbe5aa3a385b9bcba00960b (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.js13
1 files changed, 3 insertions, 10 deletions
diff --git a/app/assets/javascripts/dropzone_input.js b/app/assets/javascripts/dropzone_input.js
index 69961d2e07a..49f54261983 100644
--- a/app/assets/javascripts/dropzone_input.js
+++ b/app/assets/javascripts/dropzone_input.js
@@ -219,12 +219,8 @@ export default function dropzoneInput(form, config = { parallelUploads: 2 }) {
const caretStart = textarea.selectionStart;
const caretEnd = textarea.selectionEnd;
const textEnd = $(child).val().length;
- const beforeSelection = $(child)
- .val()
- .substring(0, caretStart);
- const afterSelection = $(child)
- .val()
- .substring(caretEnd, textEnd);
+ const beforeSelection = $(child).val().substring(0, caretStart);
+ const afterSelection = $(child).val().substring(caretEnd, textEnd);
$(child).val(beforeSelection + formattedText + afterSelection);
textarea.setSelectionRange(caretStart + formattedText.length, caretEnd + formattedText.length);
textarea.style.height = `${textarea.scrollHeight}px`;
@@ -289,10 +285,7 @@ export default function dropzoneInput(form, config = { parallelUploads: 2 }) {
form.find('.markdown-selector').click(function onMarkdownClick(e) {
e.preventDefault();
- $(this)
- .closest('.gfm-form')
- .find('.div-dropzone')
- .click();
+ $(this).closest('.gfm-form').find('.div-dropzone').click();
formTextarea.focus();
});