From f29ac8ad47d3826c2cf4401d7de0445abf995db6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 17 Nov 2021 12:38:52 +0300 Subject: [PATCH 1/2] [DE forms] Fix Bug 53766 --- .../documenteditor/forms/app/controller/ApplicationController.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index cc5a99379..510d303bb 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -513,6 +513,7 @@ define([ this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyForms); this.api.asc_SetFastCollaborative(true); this.api.asc_setAutoSaveGap(1); + this.api.SetCollaborativeMarksShowType(Asc.c_oAscCollaborativeMarksShowType.None); } var $parent = labelDocName.parent(); From 419b72c6d5493587337ea48a737ef431c85d1be8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 17 Nov 2021 13:35:03 +0300 Subject: [PATCH 2/2] [DE forms] Fix dark logo --- apps/documenteditor/forms/index.html.deploy | 32 +++++++++------------ 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/apps/documenteditor/forms/index.html.deploy b/apps/documenteditor/forms/index.html.deploy index 82bb68c0f..4687998d7 100644 --- a/apps/documenteditor/forms/index.html.deploy +++ b/apps/documenteditor/forms/index.html.deploy @@ -200,14 +200,19 @@ window.frameEditorId = params["frameEditorId"]; window.parentOrigin = params["parentOrigin"]; - var elem = document.querySelector('.loading-logo'); - if (elem && (logo || logoDark)) { - elem.style.backgroundImage= 'none'; - elem.style.width = 'auto'; - elem.style.height = 'auto'; - var img = document.querySelector('.loading-logo img'); - img && img.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark); - img.style.opacity = 1; + + if (stopLoading) { + document.body.removeChild(document.getElementById('loading-mask')); + } else { + var elem = document.querySelector('.loading-logo'); + if (elem && (logo || logoDark)) { + elem.style.backgroundImage= 'none'; + elem.style.width = 'auto'; + elem.style.height = 'auto'; + var img = document.querySelector('.loading-logo img'); + img && img.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark); + img.style.opacity = 1; + } } @@ -239,17 +244,6 @@ -