From 9f185109b80a39193bdac2d5b84434771215b973 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Thu, 3 Feb 2022 15:56:38 +0300 Subject: [PATCH 1/4] [DE] Fix Bug 55281 --- .../mobile/src/controller/LongActions.jsx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/LongActions.jsx b/apps/documenteditor/mobile/src/controller/LongActions.jsx index de95424c1..28b2ad789 100644 --- a/apps/documenteditor/mobile/src/controller/LongActions.jsx +++ b/apps/documenteditor/mobile/src/controller/LongActions.jsx @@ -25,11 +25,16 @@ const LongActionsController = inject('storeAppOptions')(({storeAppOptions}) => { }; useEffect( () => { - Common.Notifications.on('engineCreated', (api) => { + const on_engine_created = api => { api.asc_registerCallback('asc_onStartAction', onLongActionBegin); api.asc_registerCallback('asc_onEndAction', onLongActionEnd); api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument); - }); + }; + + const api = Common.EditorApi.get(); + if(!api) Common.Notifications.on('engineCreated', on_engine_created); + else on_engine_created(api); + Common.Notifications.on('preloader:endAction', onLongActionEnd); Common.Notifications.on('preloader:beginAction', onLongActionBegin); Common.Notifications.on('preloader:close', closePreloader); @@ -41,7 +46,8 @@ const LongActionsController = inject('storeAppOptions')(({storeAppOptions}) => { api.asc_unregisterCallback('asc_onEndAction', onLongActionEnd); api.asc_unregisterCallback('asc_onOpenDocumentProgress', onOpenDocument); } - + + Common.Notifications.off('engineCreated', on_engine_created); Common.Notifications.off('preloader:endAction', onLongActionEnd); Common.Notifications.off('preloader:beginAction', onLongActionBegin); Common.Notifications.off('preloader:close', closePreloader); From b6b95345c84724e7bee24dde4731ab8377935c39 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Fri, 4 Feb 2022 18:23:50 +0300 Subject: [PATCH 2/4] [DE PE SSE] Fix Bug 55355 --- apps/common/mobile/resources/less/comments.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/common/mobile/resources/less/comments.less b/apps/common/mobile/resources/less/comments.less index 9dc7945cb..9b841a171 100644 --- a/apps/common/mobile/resources/less/comments.less +++ b/apps/common/mobile/resources/less/comments.less @@ -24,6 +24,9 @@ color: @text-normal; } } + .reply-date { + color: @text-secondary; + } } #add-comment-dialog, #edit-comment-dialog, #add-reply-dialog, #edit-reply-dialog { .dialog { From 8c35514cedfcc94598e860b6e1f92c2e5357bb23 Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Mon, 7 Feb 2022 13:06:41 +0300 Subject: [PATCH 3/4] [SSE] Fix Bug 55357 --- apps/common/mobile/resources/less/comments.less | 4 ++++ apps/common/mobile/resources/less/common-ios.less | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/common/mobile/resources/less/comments.less b/apps/common/mobile/resources/less/comments.less index 9b841a171..dfee37a7c 100644 --- a/apps/common/mobile/resources/less/comments.less +++ b/apps/common/mobile/resources/less/comments.less @@ -224,6 +224,10 @@ z-index: 14000; max-height: 100%; overflow: auto; + + .item-content .item-input-wrap::after { + background-color: @text-normal; + } } .dialog-backdrop.backdrop-in { diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index 871ef2973..88687b271 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -619,11 +619,11 @@ input.modal-text-input { box-sizing: border-box; height: 26px; - background: #fff; + background: @background-primary; margin: 0; margin-top: 15px; padding: 0 5px; - border: 1px solid rgba(0,0,0,.3); + border: 1px solid @text-tertiary; border-radius: 0; width: 100%; font-size: 14px; From 7558acdd76e507af2ead008b9fccbbee5cdbc5fe Mon Sep 17 00:00:00 2001 From: ShimaginAndrey Date: Tue, 8 Feb 2022 11:18:35 +0300 Subject: [PATCH 4/4] [SSE] Fix Bug 54930 --- .../mobile/src/controller/add/AddFunction.jsx | 8 +++++++- .../src/controller/settings/ApplicationSettings.jsx | 1 + apps/spreadsheeteditor/mobile/src/store/functions.js | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/add/AddFunction.jsx b/apps/spreadsheeteditor/mobile/src/controller/add/AddFunction.jsx index 8e9d6cae4..46e39c371 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/add/AddFunction.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/add/AddFunction.jsx @@ -15,6 +15,11 @@ class _FunctionGroups extends Component { this.api = Common.EditorApi.get(); this.init(); }); + + Common.Notifications.on('changeRegSettings', () => { + this.api = Common.EditorApi.get(); + this.init(); + }); } componentDidMount() { Common.Notifications.on('document:ready', () => { @@ -46,7 +51,8 @@ class _FunctionGroups extends Component { jsonDesc = data; } const grouparr = this.api.asc_getFormulasInfo(); - this.props.storeFunctions.initFunctions(grouparr, jsonDesc); + const separator = this.api.asc_getFunctionArgumentSeparator(); + this.props.storeFunctions.initFunctions(grouparr, jsonDesc, separator); }; fetch(`locale/l10n/functions/${this._editorLang}_desc.json`) diff --git a/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx b/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx index e3f2fa1dd..30fc9aeb1 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx @@ -85,6 +85,7 @@ class ApplicationSettingsController extends Component { LocalStorage.setItem("sse-settings-regional", regCode); this.initRegSettings(); if (regCode!==null) api.asc_setLocale(+regCode); + Common.Notifications.trigger('changeRegSettings'); } render() { diff --git a/apps/spreadsheeteditor/mobile/src/store/functions.js b/apps/spreadsheeteditor/mobile/src/store/functions.js index c73acc728..f7597ad86 100644 --- a/apps/spreadsheeteditor/mobile/src/store/functions.js +++ b/apps/spreadsheeteditor/mobile/src/store/functions.js @@ -10,11 +10,11 @@ export class storeFunctions { functions = {}; - initFunctions (groups, data) { - this.functions = this.getFunctions(groups, data); + initFunctions (groups, data, separator) { + this.functions = this.getFunctions(groups, data, separator); } - getFunctions (groups, data) { + getFunctions (groups, data, separator) { const functions = {}; for (let g in groups) { const group = groups[g]; @@ -28,7 +28,7 @@ export class storeFunctions { type: _name, group: groupname, caption: func.asc_getLocaleName(), - args: (data && data[_name]) ? data[_name].a : '', + args: ((data && data[_name]) ? data[_name].a : '').replace(/[,;]/g, separator), descr: (data && data[_name]) ? data[_name].d : '' }; }