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

Merge pull request #1328 from ONLYOFFICE/fix/bugfix

Browse source 
[DE forms] Fix Bug 53766
This commit is contained in:
Julia Radzhabova 2021-11-17 13:46:40 +03:00 committed by GitHub
parent b3a71bc431 419b72c6d5
commit c2244cb5a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/documenteditor/forms/app/controller/ApplicationController.js
View file

@ -513,6 +513,7 @@ define([
this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyForms); this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyForms);
this.api.asc_SetFastCollaborative(true); this.api.asc_SetFastCollaborative(true);
this.api.asc_setAutoSaveGap(1); this.api.asc_setAutoSaveGap(1);
this.api.SetCollaborativeMarksShowType(Asc.c_oAscCollaborativeMarksShowType.None);
} }
var $parent = labelDocName.parent(); var $parent = labelDocName.parent();

32
apps/documenteditor/forms/index.html.deploy
View file

@ -200,14 +200,19 @@
window.frameEditorId = params["frameEditorId"]; window.frameEditorId = params["frameEditorId"];
window.parentOrigin = params["parentOrigin"]; window.parentOrigin = params["parentOrigin"];
var elem = document.querySelector('.loading-logo');
if (elem && (logo || logoDark)) { if (stopLoading) {
elem.style.backgroundImage= 'none'; document.body.removeChild(document.getElementById('loading-mask'));
elem.style.width = 'auto'; } else {
elem.style.height = 'auto'; var elem = document.querySelector('.loading-logo');
var img = document.querySelector('.loading-logo img'); if (elem && (logo || logoDark)) {
img && img.setAttribute('src', /theme-dark/.test(document.body.className) ? logoDark || logo : logo || logoDark); elem.style.backgroundImage= 'none';
img.style.opacity = 1; 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;
}
} }
</script> </script>
@ -239,17 +244,6 @@
<span id="box-tools"></span> <span id="box-tools"></span>
</div> </div>
</div> </div>
<script>
if (stopLoading) {
document.body.removeChild(document.getElementById('loading-mask'));
} else {
var elem = document.querySelector('.loading-logo img');
if (elem) {
logo && (elem.setAttribute('src', logo));
elem.style.opacity = 1;
}
}
</script>
<script> <script>
window.requireTimeourError = function(){ window.requireTimeourError = function(){
var reqerr; var reqerr;