pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 02:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SSE DE PE] Fixed bug with custom loader in embed mode

Browse Source
This commit is contained in:
Alexei Koshelev
2023-07-21 02:58:26 +03:00
parent 2cba44cafd
commit 4e6dff4ba7
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/documenteditor/embed/js/ApplicationController.js
View File

@ -676,15 +676,22 @@ DE.ApplicationController = new(function(){
function onAdvancedOptions(type, advOptions, mode, formatOptions) {
if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
var isCustomLoader = !!config.customization.loaderName || !!config.customization.loaderLogo;
var submitPassword = function(val) {
api && api.asc_setAdvancedOptions(Asc.c_oAscAdvancedOptionsID.DRM, new Asc.asc_CDRMAdvancedOptions(val));
me.loadMask && me.loadMask.show();
$('#loading-mask').addClass("end-animation");
$('#loading-mask').removeClass("none-animation");
if(!isCustomLoader) {
$('#loading-mask').addClass("end-animation");
$('#loading-mask').removeClass("none-animation");
}
};
common.controller.modals.createDlgPassword(submitPassword);
$('#loading-mask').removeClass("end-animation");
$('#loading-mask').addClass("none-animation");
if(isCustomLoader) {
hidePreloader();
} else {
$('#loading-mask').removeClass("end-animation");
$('#loading-mask').addClass("none-animation");
}
onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
}
}

6
apps/presentationeditor/embed/js/ApplicationController.js
View File

@ -547,13 +547,15 @@ PE.ApplicationController = new(function(){
function onAdvancedOptions(type, advOptions, mode, formatOptions) {
if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
var isCustomLoader = !!config.customization.loaderName || !!config.customization.loaderLogo;
var submitPassword = function(val) {
api && api.asc_setAdvancedOptions(Asc.c_oAscAdvancedOptionsID.DRM, new Asc.asc_CDRMAdvancedOptions(val));
me.loadMask && me.loadMask.show();
$('#loading-mask').removeClass("none-animation");
if(!isCustomLoader) $('#loading-mask').removeClass("none-animation");
};
common.controller.modals.createDlgPassword(submitPassword);
$('#loading-mask').addClass("none-animation");
if(isCustomLoader) hidePreloader();
else $('#loading-mask').addClass("none-animation");
onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
}
}

6
apps/spreadsheeteditor/embed/js/ApplicationController.js
View File

@ -461,13 +461,15 @@ SSE.ApplicationController = new(function(){
function onAdvancedOptions(type, advOptions, mode, formatOptions) {
if (type == Asc.c_oAscAdvancedOptionsID.DRM) {
var isCustomLoader = !!config.customization.loaderName || !!config.customization.loaderLogo;
var submitPassword = function(val) {
api && api.asc_setAdvancedOptions(Asc.c_oAscAdvancedOptionsID.DRM, new Asc.asc_CDRMAdvancedOptions(val));
me.loadMask && me.loadMask.show();
$('#loading-mask').removeClass("none-animation");
if(!isCustomLoader) $('#loading-mask').removeClass("none-animation");
};
common.controller.modals.createDlgPassword(submitPassword);
$('#loading-mask').addClass("none-animation");
if(isCustomLoader) hidePreloader();
else $('#loading-mask').addClass("none-animation");
onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
}
}