From 36388f536038c17fb2383ff651a66356d7043971 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 28 Dec 2021 18:15:04 +0300 Subject: [PATCH 1/4] [SSE mobile] Fix Bug 54703 --- apps/spreadsheeteditor/mobile/src/controller/Main.jsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx index 2f0bd5c32..2116ebef0 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx @@ -398,11 +398,18 @@ class MainController extends Component { this.api.asc_registerCallback('asc_onEditCell', (state) => { if (state == Asc.c_oAscCellEditorState.editStart || state == Asc.c_oAscCellEditorState.editEnd) { const isEditCell = state === Asc.c_oAscCellEditorState.editStart; + const isEditEnd = state === Asc.c_oAscCellEditorState.editEnd; + if (storeFocusObjects.isEditCell !== isEditCell) { storeFocusObjects.setEditCell(isEditCell); } + + if(isEditEnd) { + storeFocusObjects.setEditFormulaMode(false); + } } else { const isFormula = state === Asc.c_oAscCellEditorState.editFormula; + if (storeFocusObjects.editFormulaMode !== isFormula) { storeFocusObjects.setEditFormulaMode(isFormula); } From 5d2d58c2ad6026a3416018220ea68f173e2b6779 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 29 Dec 2021 12:05:11 +0300 Subject: [PATCH 2/4] [DE mobile] For Bug 54712 --- apps/documenteditor/mobile/src/view/edit/EditShape.jsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx index 2a1d7a641..930652b74 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx @@ -516,15 +516,18 @@ const EditShape = props => { || shapeType=='curvedConnector3' || shapeType=='curvedConnector4' || shapeType=='curvedConnector5' || shapeType=='straightConnector1'; - let controlProps = api && api.asc_IsContentControl() ? api.asc_GetContentControlProperties() : null, - fixedSize = false; + const inControl = api.asc_IsContentControl(); + const controlProps = (api && inControl) ? api.asc_GetContentControlProperties() : null; + const lockType = controlProps ? controlProps.get_Lock() : Asc.c_oAscSdtLockType.Unlocked; + + let fixedSize = false; if (controlProps) { let spectype = controlProps.get_SpecificType(); fixedSize = (spectype == Asc.c_oAscContentControlSpecificType.CheckBox || spectype == Asc. c_oAscContentControlSpecificType.ComboBox || spectype == Asc.c_oAscContentControlSpecificType.DropDownList || spectype == Asc.c_oAscContentControlSpecificType.None || spectype == Asc.c_oAscContentControlSpecificType.Picture) && controlProps.get_FormPr() && controlProps.get_FormPr().get_Fixed(); } - let disableRemove = !!props.storeFocusObjects.paragraphObject; + let disableRemove = !!props.storeFocusObjects.paragraphObject || (lockType == Asc.c_oAscSdtLockType.SdtContentLocked || lockType == Asc.c_oAscSdtLockType.SdtLocked); return ( From a794193cb36aafe7aea2e7d959eb098c56d7c244 Mon Sep 17 00:00:00 2001 From: SergeyEzhin <41478103+SergeyEzhin@users.noreply.github.com> Date: Wed, 29 Dec 2021 20:22:43 +0300 Subject: [PATCH 3/4] [DE PE SSE mobile] Fix Bug 54632 (#1454) --- apps/documenteditor/mobile/src/controller/Main.jsx | 2 +- apps/presentationeditor/mobile/src/controller/Main.jsx | 2 +- apps/spreadsheeteditor/mobile/src/controller/Main.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index 1a35b24b7..c6c253a30 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -689,7 +689,7 @@ class MainController extends Component { const { t } = this.props; if (found) { - f7.dialog.alert(null, !(found - replaced > 0) ? Common.Utils.String.format(t('Main.textReplaceSuccess'), replaced) : Common.Utils.String.format(t('Main.textReplaceSkipped'), found - replaced)); + f7.dialog.alert(null, !(found - replaced > 0) ? t('Main.textReplaceSuccess').replace(/\{0\}/, `${replaced}`) : t('Main.textReplaceSkipped').replace(/\{0\}/, `${found - replaced}`)); } else { f7.dialog.alert(null, t('Main.textNoTextFound')); } diff --git a/apps/presentationeditor/mobile/src/controller/Main.jsx b/apps/presentationeditor/mobile/src/controller/Main.jsx index 2c49ee791..1c2d676f9 100644 --- a/apps/presentationeditor/mobile/src/controller/Main.jsx +++ b/apps/presentationeditor/mobile/src/controller/Main.jsx @@ -422,7 +422,7 @@ class MainController extends Component { const { t } = this.props; if (found) { - f7.dialog.alert(null, !(found - replaced > 0) ? Common.Utils.String.format(t('Controller.Main.textReplaceSuccess'), replaced) : Common.Utils.String.format(t('Controller.Main.textReplaceSkipped'), found - replaced)); + f7.dialog.alert(null, !(found - replaced > 0) ? t('Controller.Main.textReplaceSuccess').replace(/\{0\}/, `${replaced}`) : t('Controller.Main.textReplaceSkipped').replace(/\{0\}/, `${found - replaced}`)); } else { f7.dialog.alert(null, t('Controller.Main.textNoTextFound')); } diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx index 2116ebef0..56df7d9c4 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx @@ -427,7 +427,7 @@ class MainController extends Component { const { t } = this.props; if (this.api.isReplaceAll) { - f7.dialog.alert(null, (found) ? ((!found - replaced) ? Common.Utils.String.format(t('Controller.Main.textReplaceSuccess'), replaced) : Common.Utils.String.format(t('Controller.Main.textReplaceSkipped'), found - replaced)) : t('Controller.Main.textNoTextFound')); + f7.dialog.alert(null, (found) ? ((!found - replaced) ? t('Controller.Main.textReplaceSuccess').replace(/\{0\}/, `${replaced}`) : t('Controller.Main.textReplaceSkipped').replace(/\{0\}/, `${found - replaced}`)) : t('Controller.Main.textNoTextFound')); } } From b5d131193a3f9d8f3b11be83bc0269775f36237c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 30 Dec 2021 12:00:58 +0300 Subject: [PATCH 4/4] [DE] Fix help (#1455) --- apps/documenteditor/main/resources/help/en/Contents.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/resources/help/en/Contents.json b/apps/documenteditor/main/resources/help/en/Contents.json index 0c2cfe0b4..a371779c2 100644 --- a/apps/documenteditor/main/resources/help/en/Contents.json +++ b/apps/documenteditor/main/resources/help/en/Contents.json @@ -53,7 +53,7 @@ { "src": "UsageInstructions/CreateTableOfContents.htm", "name": "Create table of contents" }, {"src": "UsageInstructions/AddTableofFigures.htm", "name": "Add and Format a Table of Figures" }, { "src": "UsageInstructions/CreateFillableForms.htm", "name": "Create fillable forms", "headername": "Fillable forms" }, - { "src": "UsageInstructions/FillingOutForm.htm", "headername": "Filling Out a Form" }, + { "src": "UsageInstructions/FillingOutForm.htm", "name": "Filling Out a Form" }, {"src": "UsageInstructions/UseMailMerge.htm", "name": "Use mail merge", "headername": "Mail Merge"}, { "src": "UsageInstructions/InsertEquation.htm", "name": "Insert equations", "headername": "Math equations" }, {"src": "HelpfulHints/CollaborativeEditing.htm", "name": "Collaborative document editing", "headername": "Document co-editing"},