diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-07 17:29:08 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-04-14 15:30:43 +0100 |
commit | 115d1afeb386d2b1fef4ca437fafd8227d72c0ad (patch) | |
tree | d28a241e28d35328239f3dc49df941d581a74c4e /app/assets/javascripts/dropzone_input.js | |
parent | 3c9318a8c58f638f57cfe86cb2f84625445996c8 (diff) | |
download | gitlab-ce-115d1afeb386d2b1fef4ca437fafd8227d72c0ad.tar.gz |
Only add newlines for multiple uploadsremove-double-newline-for-single-attachments
Diffstat (limited to 'app/assets/javascripts/dropzone_input.js')
-rw-r--r-- | app/assets/javascripts/dropzone_input.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/dropzone_input.js b/app/assets/javascripts/dropzone_input.js index f2963a5eb19..df0e3f46827 100644 --- a/app/assets/javascripts/dropzone_input.js +++ b/app/assets/javascripts/dropzone_input.js @@ -66,7 +66,10 @@ window.DropzoneInput = (function() { form_textarea.focus(); }, success: function(header, response) { - pasteText(response.link.markdown); + const processingFileCount = this.getQueuedFiles().length + this.getUploadingFiles().length; + const shouldPad = processingFileCount >= 1; + + pasteText(response.link.markdown, shouldPad); }, error: function(temp) { var checkIfMsgExists, errorAlert; @@ -123,9 +126,10 @@ window.DropzoneInput = (function() { } return false; }; - pasteText = function(text) { + pasteText = function(text, shouldPad) { var afterSelection, beforeSelection, caretEnd, caretStart, textEnd; - var formattedText = text + "\n\n"; + var formattedText = text; + if (shouldPad) formattedText += "\n\n"; caretStart = $(child)[0].selectionStart; caretEnd = $(child)[0].selectionEnd; textEnd = $(child).val().length; |