pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-02-10 18:05:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/v7.3.1' into develop

Browse Source
This commit is contained in:
Julia Radzhabova
2023-02-03 15:12:39 +03:00
parent 7c9c2a1c4f 770a949467
commit 7f9737c84a
16 changed files with 67 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/documenteditor/main/js/ApplicationController.js
View File

@ -126,7 +126,8 @@ DE.ApplicationController = new(function(){
function onEditorPermissions(params) {
var licType = params.asc_getLicenseType();
appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit);
appOptions.isEdit = appOptions.canLicense && (permissions.edit !== false) && (config.mode !== 'view');
appOptions.canBrandingExt = params.asc_getCanBranding();
appOptions.isEdit = appOptions.canLicense && appOptions.canBrandingExt && (permissions.edit !== false) && (config.mode !== 'view');
api.asc_SetFastCollaborative(true);
api.asc_setAutoSaveGap(1);

6
test/presentationeditor/main/js/ApplicationController.js
View File

@ -121,7 +121,11 @@ PE.ApplicationController = new(function(){
function onEditorPermissions(params) {
var licType = params.asc_getLicenseType();
appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit);
appOptions.isEdit = appOptions.canLicense && (permissions.edit !== false) && (config.mode !== 'view');
appOptions.canBrandingExt = params.asc_getCanBranding();
appOptions.isEdit = appOptions.canLicense && appOptions.canBrandingExt && (permissions.edit !== false) && (config.mode !== 'view');
api.asc_SetFastCollaborative(true);
api.asc_setAutoSaveGap(1);
onLongActionBegin(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
api.asc_setViewMode(!appOptions.isEdit);

3
test/spreadsheeteditor/main/js/ApplicationController.js
View File

@ -152,7 +152,8 @@ SSE.ApplicationController = new(function(){
function onEditorPermissions(params) {
var licType = params.asc_getLicenseType();
appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit);
appOptions.isEdit = appOptions.canLicense && (permissions.edit !== false) && (config.mode !== 'view');
appOptions.canBrandingExt = params.asc_getCanBranding();
appOptions.isEdit = appOptions.canLicense && appOptions.canBrandingExt && (permissions.edit !== false) && (config.mode !== 'view');
api.asc_SetFastCollaborative(true);
api.asc_setAutoSaveGap(1);