From 0814066a3e59714ab5d4790ceefe3477c7178c72 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Wed, 3 Jun 2020 21:18:04 +0100 Subject: [PATCH 1/4] Initialize SimpleMDE when making a code comment Fix #11704 Signed-off-by: Andrew Thornton --- web_src/js/index.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index fa32c64c33cad..9ca8d5bcfc823 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1259,7 +1259,13 @@ function initPullRequestReview() { td.find("input[name='side']").val(side === 'left' ? 'previous' : 'proposed'); td.find("input[name='path']").val(path); } - commentCloud.find('textarea').focus(); + const $textarea = commentCloud.find('textarea'); + attachTribute($textarea.get(), {mentions: true, emoji: true}); + + // Give new write/preview data-tab name to distinguish from others + const $simplemde = setCommentSimpleMDE($textarea); + $textarea.focus(); + $simplemde.codemirror.focus(); }); } From 7dce871f54c9ad0a62c9e37565b6e0a6c91440d9 Mon Sep 17 00:00:00 2001 From: zeripath Date: Thu, 4 Jun 2020 19:47:52 +0100 Subject: [PATCH 2/4] Update web_src/js/index.js --- web_src/js/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index 9ca8d5bcfc823..f56d5049ce4d2 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1262,7 +1262,6 @@ function initPullRequestReview() { const $textarea = commentCloud.find('textarea'); attachTribute($textarea.get(), {mentions: true, emoji: true}); - // Give new write/preview data-tab name to distinguish from others const $simplemde = setCommentSimpleMDE($textarea); $textarea.focus(); $simplemde.codemirror.focus(); From bd237e5cf6ba7689fb67439a9783dbb9d9c7e839 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Sat, 6 Jun 2020 13:36:45 +0100 Subject: [PATCH 3/4] Styling fixes Co-Authored-By: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> Signed-off-by: Andrew Thornton --- web_src/less/_review.less | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/web_src/less/_review.less b/web_src/less/_review.less index a8df639486955..ab5506a87cb54 100644 --- a/web_src/less/_review.less +++ b/web_src/less/_review.less @@ -54,15 +54,14 @@ border: 0; padding: 0; margin: 0; - - &.markdown { - padding: 1em; - min-height: 168px; - } } &.header { padding: .1rem 1rem; + + .text { + margin: 0; + } } } @@ -76,18 +75,16 @@ } .ui.active.tab { - border: 1px solid #d4d4d5; padding: .5em; - border-radius: 0 .28571429rem .28571429rem; - } - .ui.active.markdown.tab { - border-top-left-radius: .28571429rem; + &.markdown { + padding: 1em; + min-height: 168px; + } } .ui.tabular.menu { - margin-bottom: 0; - border-bottom: 0; + margin: .5em; } .comment-list { From 552ecb61452d6b779d495b8e8a6eeda11b6d7340 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Sat, 6 Jun 2020 14:15:11 +0100 Subject: [PATCH 4/4] Fix comment reply simpleMDE too Signed-off-by: Andrew Thornton --- web_src/js/index.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/web_src/js/index.js b/web_src/js/index.js index 57ff2fd99bfce..21809f73faeeb 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1200,6 +1200,17 @@ function initPullRequestReview() { $(this).hide(); const form = $(this).parent().find('.comment-form'); form.removeClass('hide'); + const $textarea = form.find('textarea'); + let $simplemde; + if ($textarea.data('simplemde')) { + $simplemde = $textarea.data('simplemde'); + } else { + attachTribute($textarea.get(), {mentions: true, emoji: true}); + $simplemde = setCommentSimpleMDE($textarea); + $textarea.data('simplemde', $simplemde); + } + $textarea.focus(); + $simplemde.codemirror.focus(); assingMenuAttributes(form.find('.menu')); }); // The following part is only for diff views