kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'remove-double-newline-for-single-attachments' into 'master'

Browse source 
Only add newlines for multiple uploads

Closes #29782

See merge request !10545
This commit is contained in:
Phil Hughes 2017-04-14 18:18:17 +00:00
commit 344a2619bb
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/dropzone_input.js
View file

@ -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;

4
changelogs/unreleased/remove-double-newline-for-single-attachments.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Only add newlines between multiple uploads
merge_request: 10545
author:

4
spec/features/issues_spec.rb
View file

@ -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