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

Fix version history

Browse source
This commit is contained in:
Julia Radzhabova 2021-07-28 14:23:40 +03:00
parent 8635e274e5
commit 5454b06329
4 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
apps/common/main/lib/component/LoadMask.js
View file

@ -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;
}, },

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

@ -177,6 +177,9 @@ 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();

2
apps/documenteditor/main/app/controller/Main.js
View file

@ -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);
} }

2
apps/presentationeditor/main/app/controller/Main.js
View file

@ -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);
} }