Merge pull request #1024 from ONLYOFFICE/fix/version-history
Fix/version history
This commit is contained in:
commit
2be088df19
|
@ -104,38 +104,37 @@ define([
|
||||||
return this;
|
return this;
|
||||||
},
|
},
|
||||||
|
|
||||||
show: function(){
|
internalShow: function() {
|
||||||
// if (maskeEl || loaderEl)
|
this.ownerEl.append(this.maskeEl);
|
||||||
// return;
|
this.ownerEl.append(this.loaderEl);
|
||||||
|
|
||||||
|
this.loaderEl.css('min-width', $('.asc-loadmask-title', this.loaderEl).width() + 105);
|
||||||
|
|
||||||
|
if (this.ownerEl && this.ownerEl.closest('.asc-window.modal').length==0)
|
||||||
|
Common.util.Shortcuts.suspendEvents();
|
||||||
|
},
|
||||||
|
|
||||||
|
show: function(immediately){
|
||||||
// The owner is already masked
|
// The owner is already masked
|
||||||
var ownerEl = this.ownerEl,
|
if (!!this.ownerEl.ismasked)
|
||||||
loaderEl = this.loaderEl,
|
|
||||||
maskeEl = this.maskeEl;
|
|
||||||
if (!!ownerEl.ismasked)
|
|
||||||
return this;
|
return this;
|
||||||
|
|
||||||
ownerEl.ismasked = true;
|
this.ownerEl.ismasked = true;
|
||||||
|
|
||||||
var me = this;
|
var me = this;
|
||||||
if (me.title != me.options.title) {
|
if (me.title != me.options.title) {
|
||||||
me.options.title = me.title;
|
me.options.title = me.title;
|
||||||
$('.asc-loadmask-title', loaderEl).html(me.title);
|
$('.asc-loadmask-title', this.loaderEl).html(me.title);
|
||||||
}
|
}
|
||||||
|
|
||||||
// show mask after 500 ms if it wont be hided
|
if (immediately) {
|
||||||
me.timerId = setTimeout(function () {
|
me.internalShow();
|
||||||
ownerEl.append(maskeEl);
|
} else if (!me.timerId) {
|
||||||
ownerEl.append(loaderEl);
|
// show mask after 500 ms if it wont be hided
|
||||||
|
me.timerId = setTimeout(function () {
|
||||||
// if (ownerEl.height()<1 || ownerEl.width()<1)
|
me.internalShow();
|
||||||
// loaderEl.css({visibility: 'hidden'});
|
},500);
|
||||||
|
}
|
||||||
loaderEl.css('min-width', $('.asc-loadmask-title', loaderEl).width() + 105);
|
|
||||||
|
|
||||||
if (ownerEl && ownerEl.closest('.asc-window.modal').length==0)
|
|
||||||
Common.util.Shortcuts.suspendEvents();
|
|
||||||
},500);
|
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
},
|
},
|
||||||
|
|
|
@ -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,
|
||||||
|
@ -217,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)
|
||||||
|
|
|
@ -962,7 +962,7 @@ define([
|
||||||
this.loadMask.setTitle(title);
|
this.loadMask.setTitle(title);
|
||||||
|
|
||||||
if (!this.isShowOpenDialog)
|
if (!this.isShowOpenDialog)
|
||||||
this.loadMask.show();
|
this.loadMask.show(action.id===Asc.c_oAscAsyncAction['Open']);
|
||||||
} else {
|
} else {
|
||||||
this.getApplication().getController('Statusbar').setStatusCaption(text, force);
|
this.getApplication().getController('Statusbar').setStatusCaption(text, force);
|
||||||
}
|
}
|
||||||
|
|
|
@ -709,7 +709,7 @@ define([
|
||||||
this.loadMask.setTitle(title);
|
this.loadMask.setTitle(title);
|
||||||
|
|
||||||
if (!this.isShowOpenDialog)
|
if (!this.isShowOpenDialog)
|
||||||
this.loadMask.show();
|
this.loadMask.show(action.id===Asc.c_oAscAsyncAction['Open']);
|
||||||
} else {
|
} else {
|
||||||
this.getApplication().getController('Statusbar').setStatusCaption(text, force);
|
this.getApplication().getController('Statusbar').setStatusCaption(text, force);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue