From 3cb046e3430dc1910d92e058ae9fecf3fe3407a7 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Thu, 27 Jan 2022 16:44:29 +0300 Subject: [PATCH 1/5] [SSE] Fix Bug 54924 --- .../mobile/src/controller/ContextMenu.jsx | 37 ++++++++----------- .../mobile/src/store/appOptions.js | 2 +- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx b/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx index c347f4353..f57aebe28 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx @@ -214,7 +214,7 @@ class ContextMenu extends ContextMenuController { if (isEdit && EditorUIController.ContextMenu) { return EditorUIController.ContextMenu.mapMenuItems(this); } else { - const {canViewComments, canCoAuthoring, canComments } = this.props; + const {canViewComments} = this.props; const api = Common.EditorApi.get(); const cellinfo = api.asc_getCellInfo(); @@ -238,32 +238,25 @@ class ContextMenu extends ContextMenuController { case Asc.c_oAscSelectionType.RangeShapeText: istextshapemenu = true; break; } - itemsIcon.push({ - event: 'copy', - icon: 'icon-copy' - }); - - if (iscellmenu && cellinfo.asc_getHyperlink()) { - itemsText.push({ - caption: _t.menuOpenLink, - event: 'openlink' + itemsIcon.push({ + event: 'copy', + icon: 'icon-copy' }); - } - if(!isDisconnected) { - if (canViewComments && hasComments && hasComments.length>0) { - itemsText.push({ - caption: _t.menuViewComment, - event: 'viewcomment' - }); - } - if (iscellmenu && !api.isCellEdited && canCoAuthoring && canComments && hasComments && hasComments.length<1) { + if (iscellmenu && cellinfo.asc_getHyperlink()) { itemsText.push({ - caption: _t.menuAddComment, - event: 'addcomment' + caption: _t.menuOpenLink, + event: 'openlink' }); } - } + if(!isDisconnected) { + if (canViewComments && hasComments && hasComments.length>0) { + itemsText.push({ + caption: _t.menuViewComment, + event: 'viewcomment' + }); + } + } return itemsIcon.concat(itemsText); } diff --git a/apps/spreadsheeteditor/mobile/src/store/appOptions.js b/apps/spreadsheeteditor/mobile/src/store/appOptions.js index d21a85617..7f8078ef7 100644 --- a/apps/spreadsheeteditor/mobile/src/store/appOptions.js +++ b/apps/spreadsheeteditor/mobile/src/store/appOptions.js @@ -90,7 +90,7 @@ export class storeAppOptions { this.canEdit = permissions.edit !== false && // can edit or review (this.config.canRequestEditRights || this.config.mode !== 'view') && isSupportEditFeature; // if mode=="view" -> canRequestEditRights must be defined // (!this.isReviewOnly || this.canLicense) && // if isReviewOnly==true -> canLicense must be true - this.isEdit = (this.canLicense || this.isEditDiagram || this.isEditMailMerge) && permissions.edit !== false && this.config.mode !== 'view' && true; + this.isEdit = (this.canLicense || this.isEditDiagram || this.isEditMailMerge) && permissions.edit !== false && this.config.mode !== 'view' && isSupportEditFeature && true; this.canComments = this.canLicense && (permissions.comment === undefined ? this.isEdit : permissions.comment) && (this.config.mode !== 'view'); this.canComments = this.canComments && !((typeof (this.customization) == 'object') && this.customization.comments===false); this.canViewComments = this.canComments || !((typeof (this.customization) == 'object') && this.customization.comments===false); From ab17a7161a6837d358b6a44ea39c28150fa9a4a4 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Thu, 27 Jan 2022 17:17:09 +0300 Subject: [PATCH 2/5] [DE] Fix Bug 55111 --- apps/common/mobile/resources/less/common-material.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/common/mobile/resources/less/common-material.less b/apps/common/mobile/resources/less/common-material.less index da9496959..05ec85112 100644 --- a/apps/common/mobile/resources/less/common-material.less +++ b/apps/common/mobile/resources/less/common-material.less @@ -29,6 +29,8 @@ --f7-range-knob-color: @brandColor; --f7-range-knob-size: 16px; + --f7-list-item-after-text-color: @text-normal; + --f7-link-highlight-color: transparent; --f7-link-touch-ripple-color: @touchColor; From de614733c423f42b584957f1750b8d8a66b86077 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Mon, 31 Jan 2022 11:30:04 +0300 Subject: [PATCH 3/5] [SSE] Fix Bug 55113 --- apps/spreadsheeteditor/mobile/src/less/celleditor.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/spreadsheeteditor/mobile/src/less/celleditor.less b/apps/spreadsheeteditor/mobile/src/less/celleditor.less index f59c51d7d..629d01609 100644 --- a/apps/spreadsheeteditor/mobile/src/less/celleditor.less +++ b/apps/spreadsheeteditor/mobile/src/less/celleditor.less @@ -61,6 +61,8 @@ //font-size: 17px; text-align: center; + color: @text-normal; + &[disabled] { color: @gray-darker; opacity: 0.5; From cf2f8820b98afd8c094ba9c7811c560bb62d8cb2 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Mon, 31 Jan 2022 15:26:01 +0300 Subject: [PATCH 4/5] [SSE] Fix Bug 55134, 55186 --- .../src/view/settings/ApplicationSettings.jsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx b/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx index a9500b69c..f09d4eb2f 100644 --- a/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx +++ b/apps/documenteditor/mobile/src/view/settings/ApplicationSettings.jsx @@ -50,11 +50,6 @@ const PageApplicationSettings = props => { }} /> - - {Themes.switchDarkTheme(!toggle), setIsThemeDark(!toggle)}}> - - {/*ToDo: if (DisplayMode == "final" || DisplayMode == "original") {disabled} */} @@ -95,6 +90,15 @@ const PageApplicationSettings = props => { /> + + + + {Themes.switchDarkTheme(!toggle), setIsThemeDark(!toggle)}}> + + + + {_isShowMacros && Date: Mon, 31 Jan 2022 16:14:39 +0300 Subject: [PATCH 5/5] Correct flag 'isEdit' --- apps/spreadsheeteditor/mobile/src/store/appOptions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/mobile/src/store/appOptions.js b/apps/spreadsheeteditor/mobile/src/store/appOptions.js index 7f8078ef7..6807fd51e 100644 --- a/apps/spreadsheeteditor/mobile/src/store/appOptions.js +++ b/apps/spreadsheeteditor/mobile/src/store/appOptions.js @@ -90,7 +90,7 @@ export class storeAppOptions { this.canEdit = permissions.edit !== false && // can edit or review (this.config.canRequestEditRights || this.config.mode !== 'view') && isSupportEditFeature; // if mode=="view" -> canRequestEditRights must be defined // (!this.isReviewOnly || this.canLicense) && // if isReviewOnly==true -> canLicense must be true - this.isEdit = (this.canLicense || this.isEditDiagram || this.isEditMailMerge) && permissions.edit !== false && this.config.mode !== 'view' && isSupportEditFeature && true; + this.isEdit = (this.canLicense || this.isEditDiagram || this.isEditMailMerge) && permissions.edit !== false && this.config.mode !== 'view' && isSupportEditFeature; this.canComments = this.canLicense && (permissions.comment === undefined ? this.isEdit : permissions.comment) && (this.config.mode !== 'view'); this.canComments = this.canComments && !((typeof (this.customization) == 'object') && this.customization.comments===false); this.canViewComments = this.canComments || !((typeof (this.customization) == 'object') && this.customization.comments===false);