Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 2 deletions

diff --git a/app/assets/javascripts/dropzone_input.js b/app/assets/javascripts/dropzone_input.js
index 86590865892..0e2dd59092a 100644
--- a/app/assets/javascripts/dropzone_input.js
+++ b/app/assets/javascripts/dropzone_input.js
@@ -259,8 +259,15 @@ export default function dropzoneInput(form) {
 
   const insertToTextArea = (filename, url) => {
     const $child = $(child);
-    $child.val((index, val) => val.replace(`{{${filename}}}`, url));
-
+    const textarea = $child.get(0);
+    const caretStart = textarea.selectionStart;
+    const caretEnd = textarea.selectionEnd;
+    const formattedText = `{{${filename}}}`;
+    $child.val((index, val) => val.replace(formattedText, url));
+    textarea.setSelectionRange(
+      caretStart - formattedText.length + url.length,
+      caretEnd - formattedText.length + url.length,
+    );
     $child.trigger('change');
   };