diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 39ec087608..33838312f6 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -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); } } diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index db9ff172b6..474cf8d534 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -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); } } diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 6c0f89e19a..984a1d0d2c 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -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); } }