diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-06-27 14:34:21 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-27 22:15:11 +0300 |
| commit | 76d94cadbe0c2750638977fba9a46927cc16e735 (patch) | |
| tree | 01046f1af46fe5a67d48fce2c24a206aaa34d177 /app | |
| parent | 3af47cf16150326bc64e97d30fdb534f92d0e451 (diff) | |
Merge branch 'issue-form-multiple-line-markdown' into 'master'
Fixed multi-line markdown in issue edit form
Closes #34318
See merge request !12458
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/lib/utils/text_utility.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/lib/utils/text_utility.js b/app/assets/javascripts/lib/utils/text_utility.js index 601d01e1be1..021f936a4fa 100644 --- a/app/assets/javascripts/lib/utils/text_utility.js +++ b/app/assets/javascripts/lib/utils/text_utility.js @@ -94,8 +94,8 @@ gl.text.insertText = function(textArea, text, tag, blockTag, selected, wrap) { startChar = !wrap && !currentLineEmpty && textArea.selectionStart > 0 ? '\n' : ''; - if (selectedSplit.length > 1 && (!wrap || (blockTag != null))) { - if (blockTag != null) { + if (selectedSplit.length > 1 && (!wrap || (blockTag != null && blockTag !== ''))) { + if (blockTag != null && blockTag !== '') { insertText = this.blockTagText(text, textArea, blockTag, selected); } else { insertText = selectedSplit.map(function(val) { |