diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-08-07 11:14:00 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-08-08 10:46:17 +0200 |
| commit | e70d06dff88675e4e7d88ff8b798b4090dd4d0ae (patch) | |
| tree | fb5ddd27bc19eda3ad2cf95fad63a22b59283138 /app/assets/javascripts/diffs/components | |
| parent | f68f405c17d78c18d7e22cbf67895fa366628e50 (diff) | |
| download | gitlab-ce-e70d06dff88675e4e7d88ff8b798b4090dd4d0ae.tar.gz | |
Incremental Rendering of the MR
Diffstat (limited to 'app/assets/javascripts/diffs/components')
| -rw-r--r-- | app/assets/javascripts/diffs/components/app.vue | 13 | ||||
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_file.vue | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue index 7cc4e6a2c3a..51d86dc661f 100644 --- a/app/assets/javascripts/diffs/components/app.vue +++ b/app/assets/javascripts/diffs/components/app.vue @@ -114,11 +114,16 @@ export default { this.adjustView(); }, methods: { - ...mapActions('diffs', ['setBaseConfig', 'fetchDiffFiles']), + ...mapActions('diffs', ['setBaseConfig', 'fetchDiffFiles', 'startRenderDiffsQueue']), fetchData() { - this.fetchDiffFiles().catch(() => { - createFlash(__('Something went wrong on our end. Please try again!')); - }); + this.fetchDiffFiles() + .then(() => { + console.log('Done'); + requestIdleCallback(this.startRenderDiffsQueue, { timeout: 1000 }); + }) + .catch(() => { + createFlash(__('Something went wrong on our end. Please try again!')); + }); if (!this.isNotesFetched) { eventHub.$emit('fetchNotesData'); diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue index 7e7058d8d08..716ebad209f 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -121,12 +121,12 @@ export default { </div> <diff-content - v-if="!isCollapsed" + v-if="!isCollapsed && file.renderIt" :class="{ hidden: isCollapsed || file.tooLarge }" :diff-file="file" /> <loading-icon - v-if="isLoadingCollapsedDiff" + v-if="isLoadingCollapsedDiff || !file.renderIt" class="diff-content loading" /> <div |