From 4f956a6c230726954d090a49deb27287c2321149 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Sat, 17 Jul 2021 02:36:21 +0300 Subject: [PATCH 1/4] Fix Bug 49342 --- apps/documenteditor/mobile/locale/backup/ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/locale/backup/ru.json b/apps/documenteditor/mobile/locale/backup/ru.json index f4e130890..fe0a9e90b 100644 --- a/apps/documenteditor/mobile/locale/backup/ru.json +++ b/apps/documenteditor/mobile/locale/backup/ru.json @@ -106,7 +106,7 @@ "DE.Controllers.DocumentHolder.menuSplit": "Разделить ячейку", "DE.Controllers.DocumentHolder.sheetCancel": "Отмена", "DE.Controllers.DocumentHolder.textCancel": "Отмена", - "DE.Controllers.DocumentHolder.textColumns": "Колонки", + "DE.Controllers.DocumentHolder.textColumns": "Столбцы", "DE.Controllers.DocumentHolder.textCopyCutPasteActions": "Операции копирования, вырезания и вставки", "DE.Controllers.DocumentHolder.textDoNotShowAgain": "Больше не показывать", "DE.Controllers.DocumentHolder.textGuest": "Гость", From 6067e344a257ad210601c9286d2e8928777377cc Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Sat, 17 Jul 2021 02:45:16 +0300 Subject: [PATCH 2/4] Fix Bug 49540 --- apps/documenteditor/mobile/locale/backup/ru.json | 2 +- apps/spreadsheeteditor/mobile/locale/ru.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/mobile/locale/backup/ru.json b/apps/documenteditor/mobile/locale/backup/ru.json index fe0a9e90b..380cefb70 100644 --- a/apps/documenteditor/mobile/locale/backup/ru.json +++ b/apps/documenteditor/mobile/locale/backup/ru.json @@ -394,7 +394,7 @@ "DE.Views.EditShape.textFromText": "Расстояние до текста", "DE.Views.EditShape.textInFront": "Перед текстом", "DE.Views.EditShape.textInline": "В тексте", - "DE.Views.EditShape.textOpacity": "Прозрачность", + "DE.Views.EditShape.textOpacity": "Непрозрачность", "DE.Views.EditShape.textOverlap": "Разрешить перекрытие", "DE.Views.EditShape.textRemoveShape": "Удалить фигуру", "DE.Views.EditShape.textReorder": "Порядок", diff --git a/apps/spreadsheeteditor/mobile/locale/ru.json b/apps/spreadsheeteditor/mobile/locale/ru.json index 05a06bf8b..25f315c1f 100644 --- a/apps/spreadsheeteditor/mobile/locale/ru.json +++ b/apps/spreadsheeteditor/mobile/locale/ru.json @@ -551,7 +551,7 @@ "SSE.Views.EditShape.textEffects": "Эффекты", "SSE.Views.EditShape.textFill": "Заливка", "SSE.Views.EditShape.textForward": "Перенести вперед", - "SSE.Views.EditShape.textOpacity": "Прозрачность", + "SSE.Views.EditShape.textOpacity": "Непрозрачность", "SSE.Views.EditShape.textRemoveShape": "Удалить фигуру", "SSE.Views.EditShape.textReorder": "Порядок", "SSE.Views.EditShape.textReplace": "Заменить", From a5a70b05d0795d42d5c0a5376ad08e0acccbf53a Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Sat, 17 Jul 2021 16:54:49 +0300 Subject: [PATCH 3/4] Fix Bug 51169 --- apps/common/mobile/resources/less/common.less | 81 ++++++++++--------- 1 file changed, 44 insertions(+), 37 deletions(-) diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 1371c75b2..9b9d9ee48 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -383,47 +383,54 @@ } } -.color-palettes { - .palette { - padding: 8px 0px; - a { - flex-grow: 1; - position: relative; - min-width: 10px; - min-height: 26px; - margin: 1px 1px 0 0; - box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset; - &.active:after { - content: ' '; - position: absolute; - width: 100%; - height: 100%; - box-shadow: 0 0 0 1px @white, 0 0 0 4px @themeColor; - z-index: 1; - border-radius: 1px; - } - &.transparent { - background-repeat: no-repeat; - background-size: 100% 100%; - .encoded-svg-background(""); +.page { + .color-palettes { + .list { + .palette { + padding: 8px 0px; + .row { + a { + flex-grow: 1; + position: relative; + min-width: 10px; + min-height: 26px; + margin: 1px 1px 0 0; + box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset; + border-radius: 0; + &.active:after { + content: ' '; + position: absolute; + width: 100%; + height: 100%; + box-shadow: 0 0 0 1px @white, 0 0 0 4px @themeColor; + z-index: 1; + border-radius: 1px; + } + &.transparent { + background-repeat: no-repeat; + background-size: 100% 100%; + .encoded-svg-background(""); + } + } + } } } - } - .row { - padding: 0; - } - .list .item-inner { - display: block; - } - .standart-colors, .dynamic-colors { - .palette { - display: flex; + .row { + padding: 0; + } + .list .item-inner { + display: block; + } + .standart-colors, .dynamic-colors { + .palette { + display: flex; + } } - } - .dynamic-colors { - .empty-color { - background-color: @white; + .dynamic-colors { + .empty-color { + background-color: @white; + } } } } From a5d2df5a7d7a032826bf5f4a2c0ace09227da261 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Mon, 19 Jul 2021 13:56:51 +0300 Subject: [PATCH 4/4] [SSE mobile] Fix Bug 51180 --- apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx b/apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx index 8db15a70a..09cb1048f 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx @@ -53,7 +53,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetIn const api = Common.EditorApi.get(); api.asc_unregisterCallback('asc_onCanUndoChanged', onApiCanUndo); api.asc_unregisterCallback('asc_onCanRedoChanged', onApiCanRedo); - //api.asc_unregisterCallback('asc_onSelectionChanged', onApiSelectionChanged); TO DO + // api.asc_unregisterCallback('asc_onSelectionChanged', onApiSelectionChanged); TO DO api.asc_unregisterCallback('asc_onWorkbookLocked', onApiSelectionChanged); api.asc_unregisterCallback('asc_onWorksheetLocked', onApiSelectionChanged); api.asc_unregisterCallback('asc_onActiveSheetChanged', onApiActiveSheetChanged); @@ -137,7 +137,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetIn if (isDisconnected) return; const api = Common.EditorApi.get(); - const info = !!cellInfo ? cellInfo : api.asc_getCellInfo(); + const info = cellInfo && typeof cellInfo === 'object' ? cellInfo : api.asc_getCellInfo(); let islocked = false; switch (info.asc_getSelectionType()) {