agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-15 06:33:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2999 from overleaf/as-em-fix-double-updates-load

Browse Source 
Fix history loading updates twice on scroll

GitOrigin-RevId: 964863c7357eef36b2833c7b1e8ebaa07020fb2c
This commit is contained in:
Eric Mc Sween
2020-07-21 02:06:42 +00:00
committed by Copybot
parent c200511f86
commit 5b0d5447da
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/frontend/js/ide/history/HistoryV2Manager.js
+4
View File
@@ -130,6 +130,7 @@ export default (HistoryManager = (function() {
updates: [], updates: [],
viewMode: this._getViewModeUserPref(), viewMode: this._getViewModeUserPref(),
nextBeforeTimestamp: null, nextBeforeTimestamp: null,
loading: false,
atEnd: false, atEnd: false,
userHasFullFeature: undefined, userHasFullFeature: undefined,
freeHistoryLimitHit: false, freeHistoryLimitHit: false,
@@ -618,9 +619,11 @@ export default (HistoryManager = (function() {
requests.labels = this.ide.$http.get(labelsURL) requests.labels = this.ide.$http.get(labelsURL)
} }
this.$scope.history.loading = true
return this.ide.$q return this.ide.$q
.all(requests) .all(requests)
.then(response => { .then(response => {
this.$scope.history.loading = false
const updatesData = response.updates.data const updatesData = response.updates.data
let lastUpdateToV = null let lastUpdateToV = null
@@ -648,6 +651,7 @@ export default (HistoryManager = (function() {
} }
}) })
.catch(error => { .catch(error => {
this.$scope.history.loading = false
const { status, statusText } = error const { status, statusText } = error
this.$scope.history.error = { status, statusText } this.$scope.history.error = { status, statusText }
this.$scope.history.atEnd = true this.$scope.history.atEnd = true
services/web/test/karma/ide/history/HistoryV2ManagerTests.js
+1
View File
@@ -19,6 +19,7 @@ export default describe('HistoryV2Manager', function() {
updates: [], updates: [],
viewMode: 'point_in_time', viewMode: 'point_in_time',
nextBeforeTimestamp: null, nextBeforeTimestamp: null,
loading: false,
atEnd: false, atEnd: false,
userHasFullFeature: undefined, userHasFullFeature: undefined,
freeHistoryLimitHit: false, freeHistoryLimitHit: false,