diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 58ef50a4b..5b8ae11ae 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -794,7 +794,9 @@ define([ me.appOptions.canPrint = (me.permissions.print !== false); me.appOptions.fileKey = me.document.key; me.appOptions.canFillForms = ((me.permissions.fillForms===undefined) ? me.appOptions.isEdit : me.permissions.fillForms) && (me.editorConfig.mode !== 'view'); - me.appOptions.isRestrictedEdit = !me.appOptions.isEdit && me.appOptions.canFillForms; + me.appOptions.isRestrictedEdit = !me.appOptions.isEdit && (me.appOptions.canComments || me.appOptions.canFillForms); + if (me.appOptions.isRestrictedEdit && me.appOptions.canComments && me.appOptions.canFillForms) // must be one restricted mode, priority for filling forms + me.appOptions.canComments = false; var type = /^(?:(pdf|djvu|xps))$/.exec(me.document.fileType); me.appOptions.canDownloadOrigin = me.permissions.download !== false && (type && typeof type[1] === 'string'); @@ -815,6 +817,7 @@ define([ me.applyModeEditorElements(); me.api.asc_setViewMode(!me.appOptions.isEdit && !me.appOptions.isRestrictedEdit); + me.appOptions.isRestrictedEdit && this.appOptions.canComments && me.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyComments); me.appOptions.isRestrictedEdit && me.appOptions.canFillForms && me.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyForms); me.api.asc_LoadDocument(); me.api.Resize(); diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index d2b05eaec..08588e2ec 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -298,7 +298,7 @@ define([ if (me.api) { me.api.asc_enableKeyEvents(mode.isEdit); - me.api.asc_setViewMode(!mode.isEdit); + me.api.asc_setViewMode(!mode.isEdit && !mode.isRestrictedEdit); } }, @@ -722,6 +722,7 @@ define([ me.appOptions.canChat = me.appOptions.canLicense && !me.appOptions.isOffline && !((typeof (me.editorConfig.customization) == 'object') && me.editorConfig.customization.chat===false); me.appOptions.canEditStyles = me.appOptions.canLicense && me.appOptions.canEdit; me.appOptions.canPrint = (me.permissions.print !== false); + me.appOptions.isRestrictedEdit = !me.appOptions.isEdit && me.appOptions.canComments; var type = /^(?:(pdf|djvu|xps))$/.exec(me.document.fileType); me.appOptions.canDownloadOrigin = me.permissions.download !== false && (type && typeof type[1] === 'string'); @@ -736,7 +737,8 @@ define([ me.applyModeCommonElements(); me.applyModeEditorElements(); - me.api.asc_setViewMode(!me.appOptions.isEdit); + me.api.asc_setViewMode(!me.appOptions.isEdit && !me.appOptions.isRestrictedEdit); + (me.appOptions.isRestrictedEdit && me.appOptions.canComments) && me.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyComments); me.api.asc_LoadDocument(); me.api.Resize(); diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 358a909dd..005a32cdd 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -311,7 +311,7 @@ define([ if ( me.api ) { me.api.asc_enableKeyEvents(mode.isEdit); - me.api.asc_setViewMode(!mode.isEdit); + me.api.asc_setViewMode(!mode.isEdit && !mode.isRestrictedEdit); } }, @@ -754,11 +754,13 @@ define([ me.appOptions.isEdit = (me.appOptions.canLicense || me.appOptions.isEditDiagram || me.appOptions.isEditMailMerge) && me.permissions.edit !== false && me.editorConfig.mode !== 'view' && me.isSupportEditFeature(); me.appOptions.canDownload = (me.permissions.download !== false); me.appOptions.canPrint = (me.permissions.print !== false); + me.appOptions.isRestrictedEdit = !me.appOptions.isEdit && me.appOptions.canComments; me.applyModeCommonElements(); me.applyModeEditorElements(); - me.api.asc_setViewMode(!me.appOptions.isEdit); + me.api.asc_setViewMode(!me.appOptions.isEdit && !me.appOptions.isRestrictedEdit); + (me.appOptions.isRestrictedEdit && me.appOptions.canComments) && me.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyComments); me.api.asc_LoadDocument(); if (!me.appOptions.isEdit) {