diff options
author | André Luís <aluis@gitlab.com> | 2018-07-31 01:50:40 +0100 |
---|---|---|
committer | André Luís <aluis@gitlab.com> | 2018-08-01 13:45:15 +0100 |
commit | 113f9f337c678129e811fcdfb418ba011ac1eb2b (patch) | |
tree | 08b0225aca3c9e31b3be25859f3d2518cc50da69 /app/assets/javascripts/diffs/components/inline_diff_view.vue | |
parent | 32737672fa0579dbf3e51fa6bbd0face3c8d6cc8 (diff) | |
download | gitlab-ce-113f9f337c678129e811fcdfb418ba011ac1eb2b.tar.gz |
Revert "Merge branch 'tz-mr-refactor-memory-reduction' into 'master'"
This reverts commit 2411ecb5762f8e04a6c6f61cc50ed25f29f55be3, reversing
changes made to 58a0df7e68e46902e453a0252e6753517d9cf665.
Diffstat (limited to 'app/assets/javascripts/diffs/components/inline_diff_view.vue')
-rw-r--r-- | app/assets/javascripts/diffs/components/inline_diff_view.vue | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/app/assets/javascripts/diffs/components/inline_diff_view.vue b/app/assets/javascripts/diffs/components/inline_diff_view.vue index 5f30cc57a59..8e491d293e5 100644 --- a/app/assets/javascripts/diffs/components/inline_diff_view.vue +++ b/app/assets/javascripts/diffs/components/inline_diff_view.vue @@ -20,11 +20,7 @@ export default { }, }, computed: { - ...mapGetters('diffs', [ - 'commitId', - 'shouldRenderInlineCommentRow', - 'singleDiscussionByLineCode', - ]), + ...mapGetters('diffs', ['commitId', 'discussionsByLineCode']), ...mapState({ diffLineCommentForms: state => state.diffs.diffLineCommentForms, }), @@ -38,7 +34,18 @@ export default { return window.gon.user_color_scheme; }, }, - methods: {}, + methods: { + shouldRenderCommentRow(line) { + if (this.diffLineCommentForms[line.lineCode]) return true; + + const lineDiscussions = this.discussionsByLineCode[line.lineCode]; + if (lineDiscussions === undefined) { + return false; + } + + return lineDiscussions.every(discussion => discussion.expanded); + }, + }, }; </script> @@ -57,15 +64,13 @@ export default { :line="line" :is-bottom="index + 1 === diffLinesLength" :key="line.lineCode" - :discussions="singleDiscussionByLineCode(line.lineCode)" /> <inline-diff-comment-row - v-if="shouldRenderInlineCommentRow(line)" + v-if="shouldRenderCommentRow(line)" :diff-file-hash="diffFile.fileHash" :line="line" :line-index="index" :key="index" - :discussions="singleDiscussionByLineCode(line.lineCode)" /> </template> </tbody> |