diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-22 19:47:25 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-22 19:47:25 +0000 |
| commit | fb81291ee00a18e12ff290ae8b4caa63bb90e556 (patch) | |
| tree | 7a9fdbb0848020913d80873d137f92c80762558f /app | |
| parent | 61e2a3eb15b2b7661523214c86c0f4f3d5ecc525 (diff) | |
| parent | 9f322f2b3866833af1bca7ecd3624428d968b017 (diff) | |
| download | gitlab-ce-fb81291ee00a18e12ff290ae8b4caa63bb90e556.tar.gz | |
Merge branch 'newline-after-file-attachment-notes' into 'master'
Added double newline after file upload markdown insert
Closes #28511
See merge request !9430
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/dropzone_input.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/dropzone_input.js b/app/assets/javascripts/dropzone_input.js index 64a7a9eaf37..646f836aff0 100644 --- a/app/assets/javascripts/dropzone_input.js +++ b/app/assets/javascripts/dropzone_input.js @@ -126,13 +126,14 @@ require('./preview_markdown'); }; pasteText = function(text) { var afterSelection, beforeSelection, caretEnd, caretStart, textEnd; + var formattedText = text + "\n\n"; caretStart = $(child)[0].selectionStart; caretEnd = $(child)[0].selectionEnd; textEnd = $(child).val().length; beforeSelection = $(child).val().substring(0, caretStart); afterSelection = $(child).val().substring(caretEnd, textEnd); - $(child).val(beforeSelection + text + afterSelection); - child.get(0).setSelectionRange(caretStart + text.length, caretEnd + text.length); + $(child).val(beforeSelection + formattedText + afterSelection); + child.get(0).setSelectionRange(caretStart + formattedText.length, caretEnd + formattedText.length); return form_textarea.trigger("input"); }; getFilename = function(e) { |