Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix fast clicks on version history

Browse source
This commit is contained in:
Julia Radzhabova 2021-07-28 16:30:44 +03:00
parent 5454b06329
commit d786f49e05
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/common/main/lib/controller/History.js
View file

@ -136,9 +136,15 @@ define([
this.currentServerVersion = record.get('serverVersion'); this.currentServerVersion = record.get('serverVersion');
if ( _.isEmpty(url) || (urlGetTime - record.get('urlGetTime') > 5 * 60000)) { if ( _.isEmpty(url) || (urlGetTime - record.get('urlGetTime') > 5 * 60000)) {
_.delay(function() { var me = this;
Common.Gateway.requestHistoryData(rev); // получаем url-ы для ревизий if (!me.timerId) {
}, 10); me.timerId = setTimeout(function () {
me.timerId = 0;
},30000);
_.delay(function() {
Common.Gateway.requestHistoryData(rev); // получаем url-ы для ревизий
}, 10);
}
} else { } else {
var commentsController = this.getApplication().getController('Common.Controllers.Comments'); var commentsController = this.getApplication().getController('Common.Controllers.Comments');
if (commentsController) { if (commentsController) {
@ -168,6 +174,11 @@ define([
onSetHistoryData: function(opts) { onSetHistoryData: function(opts) {
if (!this.mode.canUseHistory) return; if (!this.mode.canUseHistory) return;
if (this.timerId) {
clearTimeout(this.timerId);
this.timerId = 0;
}
if (opts.data.error) { if (opts.data.error) {
var config = { var config = {
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
@ -177,9 +188,6 @@ define([
}; };
Common.UI.alert(config); Common.UI.alert(config);
} else { } else {
if (this.currentRev !== opts.data.version) {
return;
}
var commentsController = this.getApplication().getController('Common.Controllers.Comments'); var commentsController = this.getApplication().getController('Common.Controllers.Comments');
if (commentsController) { if (commentsController) {
commentsController.onApiHideComment(); commentsController.onApiHideComment();
@ -220,6 +228,7 @@ define([
hist.asc_setIsRequested(true); hist.asc_setIsRequested(true);
hist.asc_setServerVersion(this.currentServerVersion); hist.asc_setServerVersion(this.currentServerVersion);
this.api.asc_showRevision(hist); this.api.asc_showRevision(hist);
this.currentRev = data.version;
var reviewController = this.getApplication().getController('Common.Controllers.ReviewChanges'); var reviewController = this.getApplication().getController('Common.Controllers.ReviewChanges');
if (reviewController) if (reviewController)