diff options
author | Phil Hughes <me@iamphill.com> | 2016-07-27 18:34:04 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-07-27 18:34:04 +0100 |
commit | 2247d8a4fd7f77e1a4b8a50becdd08643435f19d (patch) | |
tree | 7a3e9c5769894b1e04cb66a95f7192ebd1d80e4c /app/assets/javascripts/diff_notes/services | |
parent | 86446846e963ea1304b56fa74b4ca795a491bbb5 (diff) | |
download | gitlab-ce-2247d8a4fd7f77e1a4b8a50becdd08643435f19d.tar.gz |
Updates the text above discussions when resolving notes & discussions
Diffstat (limited to 'app/assets/javascripts/diff_notes/services')
-rw-r--r-- | app/assets/javascripts/diff_notes/services/resolve.js.es6 | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/app/assets/javascripts/diff_notes/services/resolve.js.es6 b/app/assets/javascripts/diff_notes/services/resolve.js.es6 index 28830f4af4e..012ea3769c1 100644 --- a/app/assets/javascripts/diff_notes/services/resolve.js.es6 +++ b/app/assets/javascripts/diff_notes/services/resolve.js.es6 @@ -58,6 +58,8 @@ CommentsStore.loading[discussionId] = false; CommentsStore.updateCommentsForDiscussion(discussionId, true, user); + + this.updateUpdatedHtml(discussionId, data); }); } @@ -71,11 +73,28 @@ mergeRequestId, discussionId }, {}).then((response) => { + const data = response.data; CommentsStore.loading[discussionId] = false; CommentsStore.updateCommentsForDiscussion(discussionId, false); + + this.updateUpdatedHtml(discussionId, data); }); } + + updateUpdatedHtml(discussionId, data) { + const $discussionHeadline = $(`.${discussionId} .js-discussion-headline`); + + if (data.updated_html) { + if ($discussionHeadline.length) { + $discussionHeadline.replaceWith(data.updated_html); + } else { + $(`.${discussionId} .discussion-header`).append(data.updated_html); + } + } else { + $discussionHeadline.remove(); + } + } } w.ResolveService = new ResolveServiceClass(); |