diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-08-07 17:26:15 +0200 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-08-08 10:46:17 +0200 |
commit | 64d0f1e20e9a8f673d30d706fec5c03c9723a3fe (patch) | |
tree | a3988c60792e7f817521a9d468e87f320086b86b /app/assets/javascripts/diffs/components | |
parent | de636f165130eb68d9c8e9810ba6489ae9b86a4b (diff) | |
download | gitlab-ce-64d0f1e20e9a8f673d30d706fec5c03c9723a3fe.tar.gz |
Fixed text removal memory saving + Fixed collapsed non text files
Diffstat (limited to 'app/assets/javascripts/diffs/components')
-rw-r--r-- | app/assets/javascripts/diffs/components/diff_file.vue | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index eca9fc70490..e887a71c551 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -52,10 +52,16 @@ export default { handleToggle() { const { collapsed, highlightedDiffLines, parallelDiffLines } = this.file; - if (collapsed && !highlightedDiffLines && !parallelDiffLines.length) { + if ( + collapsed && + !highlightedDiffLines && + parallelDiffLines !== undefined && + !parallelDiffLines.length + ) { this.handleLoadCollapsedDiff(); } else { this.file.collapsed = !this.file.collapsed; + this.file.renderIt = true; } }, handleLoadCollapsedDiff() { @@ -65,6 +71,7 @@ export default { .then(() => { this.isLoadingCollapsedDiff = false; this.file.collapsed = false; + this.file.renderIt = true; }) .catch(() => { this.isLoadingCollapsedDiff = false; |