Skip to content
Snippets Groups Projects
Commit 115d1afe authored by Luke "Jared" Bennett's avatar Luke "Jared" Bennett Committed by Phil Hughes
Browse files

Only add newlines for multiple uploads

parent 3c9318a8
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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;
Loading
Loading
@@ -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;
Loading
Loading
---
title: Only add newlines between multiple uploads
merge_request: 10545
author:
Loading
Loading
@@ -601,10 +601,10 @@ describe 'Issues', feature: true do
expect(page.find_field("issue_description").value).to have_content 'banana_sample'
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')
 
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
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment