diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-02-18 19:19:19 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-02-18 19:19:19 +0300 |
commit | fe10964a6884162b9272ec3a32a5736c2a997ab2 (patch) | |
tree | a425e6192d3c25975596f6535d062741223c3058 /app | |
parent | 22264555b141d8baf1260a919fb76c3ed88b1055 (diff) | |
parent | 512f9624fa8b47480da4cd0a69a493d7ccecc65a (diff) |
Merge branch 'fix-diffs-not-rendering' into 'master'
Fix diff files not rendering
See merge request gitlab-org/gitlab-ce!25358
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/diffs/components/diff_file.vue | 9 | ||||
-rw-r--r-- | app/assets/javascripts/diffs/store/actions.js | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index 347a35b9c54..1141a197c6a 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -35,7 +35,6 @@ export default { isLoadingCollapsedDiff: false, forkMessageVisible: false, isCollapsed: this.file.viewer.collapsed || false, - renderIt: this.file.renderIt, }; }, computed: { @@ -53,7 +52,7 @@ export default { ); }, showLoadingIcon() { - return this.isLoadingCollapsedDiff || (!this.renderIt && !this.isCollapsed); + return this.isLoadingCollapsedDiff || (!this.file.renderIt && !this.isCollapsed); }, hasDiffLines() { return ( @@ -80,13 +79,13 @@ export default { eventHub.$on(`loadCollapsedDiff/${this.file.file_hash}`, this.handleLoadCollapsedDiff); }, methods: { - ...mapActions('diffs', ['loadCollapsedDiff', 'assignDiscussionsToDiff']), + ...mapActions('diffs', ['loadCollapsedDiff', 'assignDiscussionsToDiff', 'setRenderIt']), handleToggle() { if (!this.hasDiffLines) { this.handleLoadCollapsedDiff(); } else { this.isCollapsed = !this.isCollapsed; - this.renderIt = true; + this.setRenderIt(this.file); } }, handleLoadCollapsedDiff() { @@ -96,7 +95,7 @@ export default { .then(() => { this.isLoadingCollapsedDiff = false; this.isCollapsed = false; - this.renderIt = true; + this.setRenderIt(this.file); }) .then(() => { requestIdleCallback( diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js index c37a5c3a45f..82ff2e3be76 100644 --- a/app/assets/javascripts/diffs/store/actions.js +++ b/app/assets/javascripts/diffs/store/actions.js @@ -131,6 +131,8 @@ export const startRenderDiffsQueue = ({ state, commit }) => { return checkItem(); }; +export const setRenderIt = ({ commit }, file) => commit(types.RENDER_FILE, file); + export const setInlineDiffViewType = ({ commit }) => { commit(types.SET_DIFF_VIEW_TYPE, INLINE_DIFF_VIEW_TYPE); |