From fb74562eb123df0d5ee967bdb9ab5e51cef425a8 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 26 Jun 2024 19:13:38 +0300 Subject: [PATCH] [DE mobile] Added checking forceView and standartView parameters checks --- .../mobile/src/controller/Main.jsx | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index 9f1fec2dba..2b981cfb97 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -305,12 +305,17 @@ class MainController extends Component { const config = storeAppOptions.config; const customization = config.customization; const isMobileForceView = customization?.mobileForceView !== undefined ? customization.mobileForceView : editorConfig?.mobileForceView !== undefined ? editorConfig.mobileForceView : true; + const isForceView = customization?.mobile?.forceView ?? true; + + if(customization?.mobileForceView !== undefined && customization?.mobileForceView !== null) { + console.warn("Obsolete: The mobileForceView parameter is deprecated. Please use the forceView parameter from customization.mobile block"); + } storeAppOptions.setPermissionOptions(this.document, licType, params, this.permissions, EditorUIController.isSupportEditFeature()); this.applyMode(storeAppOptions); - if(!isForm && isMobileForceView) { + if(!isForm && (isMobileForceView || isForceView)) { this.api.asc_addRestriction(Asc.c_oAscRestrictionType.View); } else if(!isForm && !isMobileForceView) { storeAppOptions.changeViewerMode(false); @@ -330,6 +335,8 @@ class MainController extends Component { const appOptions = this.props.storeAppOptions; const isOForm = appOptions.isOForm; const appSettings = this.props.storeApplicationSettings; + const customization = appOptions.customization; + const isStandardView = customization?.mobile?.standartView ?? false; f7.emit('resize'); @@ -343,10 +350,10 @@ class MainController extends Component { appOptions.isRestrictedEdit && appOptions.canFillForms && this.api.asc_SetHighlightRequiredFields(true); let value = LocalStorage.getItem("de-settings-zoom"); - const zf = (value !== null) ? parseInt(value) : (appOptions.customization && appOptions.customization.zoom ? parseInt(appOptions.customization.zoom) : 100); + const zf = (value !== null) ? parseInt(value) : (customization && customization.zoom ? parseInt(customization.zoom) : 100); (zf === -1) ? this.api.zoomFitToPage() : ((zf === -2) ? this.api.zoomFitToWidth() : this.api.zoom(zf>0 ? zf : 100)); - value = LocalStorage.getBool("de-mobile-spellcheck", !(appOptions.customization && appOptions.customization.spellcheck === false)); + value = LocalStorage.getBool("de-mobile-spellcheck", !(customization && customization.spellcheck === false)); appSettings.changeSpellCheck(value); this.api.asc_setSpellCheck(value); @@ -360,9 +367,10 @@ class MainController extends Component { appSettings.changeShowTableEmptyLine(value); this.api.put_ShowTableEmptyLine(value); - value = LocalStorage.getBool('mobile-view', true); + + value = LocalStorage.getBool('mobile-view'); - if(value) { + if(value || !isStandardView) { this.api.ChangeReaderMode(); } else { appOptions.changeMobileView();