Commit 115d1afe authored by Luke "Jared" Bennett's avatar Luke "Jared" Bennett Committed by Phil Hughes

Only add newlines for multiple uploads

parent 3c9318a8
...@@ -66,7 +66,10 @@ window.DropzoneInput = (function() { ...@@ -66,7 +66,10 @@ window.DropzoneInput = (function() {
form_textarea.focus(); form_textarea.focus();
}, },
success: function(header, response) { 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) { error: function(temp) {
var checkIfMsgExists, errorAlert; var checkIfMsgExists, errorAlert;
...@@ -123,9 +126,10 @@ window.DropzoneInput = (function() { ...@@ -123,9 +126,10 @@ window.DropzoneInput = (function() {
} }
return false; return false;
}; };
pasteText = function(text) { pasteText = function(text, shouldPad) {
var afterSelection, beforeSelection, caretEnd, caretStart, textEnd; var afterSelection, beforeSelection, caretEnd, caretStart, textEnd;
var formattedText = text + "\n\n"; var formattedText = text;
if (shouldPad) formattedText += "\n\n";
caretStart = $(child)[0].selectionStart; caretStart = $(child)[0].selectionStart;
caretEnd = $(child)[0].selectionEnd; caretEnd = $(child)[0].selectionEnd;
textEnd = $(child).val().length; textEnd = $(child).val().length;
......
---
title: Only add newlines between multiple uploads
merge_request: 10545
author:
...@@ -601,10 +601,10 @@ describe 'Issues', feature: true do ...@@ -601,10 +601,10 @@ describe 'Issues', feature: true do
expect(page.find_field("issue_description").value).to have_content 'banana_sample' expect(page.find_field("issue_description").value).to have_content 'banana_sample'
end end
it 'adds double newline to end of attachment markdown' do it "doesn't add double newline to end of a single attachment markdown" do
dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif') dropzone_file Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
expect(page.find_field("issue_description").value).to match /\n\n$/ expect(page.find_field("issue_description").value).not_to match /\n\n$/
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment