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

[SSE] Fix Bug 40746

Browse source
This commit is contained in:
Julia Radzhabova 2019-03-19 15:54:20 +03:00
parent 3d32e495ea
commit 55dc6ae0cd
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -156,6 +156,16 @@ define([
isVisible: function() { isVisible: function() {
return !_.isEmpty(loaderEl); return !_.isEmpty(loaderEl);
},
updatePosition: function() {
if (ownerEl && ownerEl.hasClass('masked') && loaderEl){
loaderEl.css({
top : Math.round(ownerEl.height() / 2 - (loaderEl.height() + parseInt(loaderEl.css('padding-top')) + parseInt(loaderEl.css('padding-bottom'))) / 2) + 'px',
left: Math.round(ownerEl.width() / 2 - (loaderEl.width() + parseInt(loaderEl.css('padding-left')) + parseInt(loaderEl.css('padding-right'))) / 2) + 'px'
});
}
} }
} }
})()) })())

4
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1833,8 +1833,10 @@ define([
case 'setMergeData': this.setMergeData(data.data); break; case 'setMergeData': this.setMergeData(data.data); break;
case 'getMergeData': this.getMergeData(); break; case 'getMergeData': this.getMergeData(); break;
case 'setAppDisabled': case 'setAppDisabled':
if (this.isAppDisabled===undefined && !data.data) // first editor opening if (this.isAppDisabled===undefined && !data.data) { // first editor opening
Common.NotificationCenter.trigger('layout:changed', 'main'); Common.NotificationCenter.trigger('layout:changed', 'main');
this.loadMask && this.loadMask.isVisible() && this.loadMask.updatePosition();
}
this.isAppDisabled = data.data; this.isAppDisabled = data.data;
break; break;
case 'queryClose': case 'queryClose':