diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-06-29 16:25:06 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-06-29 16:25:06 +0300 |
| commit | debc61264d05fcd7f152b1251d5a3fbeb44d9bfa (patch) | |
| tree | 1ebe990dd44feb5ef1a66c57b34d2002b819ebcc /app | |
| parent | 00b03d9f9a9a7d2034fcdf202c4dbb6444f28799 (diff) | |
| parent | 84630a5d8e4e9fa575636aa34eb00a7e210ad39c (diff) | |
Merge branch 'issue-form-multiple-line-markdown-stable' into '9-3-stable-patch-3-mysql'
Issue form multiple line markdown stable
See merge request !12549
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) { |