Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1538 from ONLYOFFICE/feature/fix-bug-react

Browse source 
Feature/fix bug react
This commit is contained in:
maxkadushkin 2022-02-08 12:27:03 +03:00 committed by GitHub
parent ac21d0419b 7558acdd76
commit 44bcda87ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/common/mobile/resources/less/comments.less
View file

@ -24,6 +24,9 @@
color: @text-normal; color: @text-normal;
} }
} }
.reply-date {
color: @text-secondary;
}
} }
#add-comment-dialog, #edit-comment-dialog, #add-reply-dialog, #edit-reply-dialog { #add-comment-dialog, #edit-comment-dialog, #add-reply-dialog, #edit-reply-dialog {
.dialog { .dialog {
@ -221,6 +224,10 @@
z-index: 14000; z-index: 14000;
max-height: 100%; max-height: 100%;
overflow: auto; overflow: auto;
.item-content .item-input-wrap::after {
background-color: @text-normal;
}
} }
.dialog-backdrop.backdrop-in { .dialog-backdrop.backdrop-in {

4
apps/common/mobile/resources/less/common-ios.less
View file

@ -619,11 +619,11 @@
input.modal-text-input { input.modal-text-input {
box-sizing: border-box; box-sizing: border-box;
height: 26px; height: 26px;
background: #fff; background: @background-primary;
margin: 0; margin: 0;
margin-top: 15px; margin-top: 15px;
padding: 0 5px; padding: 0 5px;
border: 1px solid rgba(0,0,0,.3); border: 1px solid @text-tertiary;
border-radius: 0; border-radius: 0;
width: 100%; width: 100%;
font-size: 14px; font-size: 14px;

10
apps/documenteditor/mobile/src/controller/LongActions.jsx
View file

@ -25,11 +25,16 @@ const LongActionsController = inject('storeAppOptions')(({storeAppOptions}) => {
}; };
useEffect( () => { useEffect( () => {
Common.Notifications.on('engineCreated', (api) => { const on_engine_created = api => {
api.asc_registerCallback('asc_onStartAction', onLongActionBegin); api.asc_registerCallback('asc_onStartAction', onLongActionBegin);
api.asc_registerCallback('asc_onEndAction', onLongActionEnd); api.asc_registerCallback('asc_onEndAction', onLongActionEnd);
api.asc_registerCallback('asc_onOpenDocumentProgress', onOpenDocument); 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:endAction', onLongActionEnd);
Common.Notifications.on('preloader:beginAction', onLongActionBegin); Common.Notifications.on('preloader:beginAction', onLongActionBegin);
Common.Notifications.on('preloader:close', closePreloader); Common.Notifications.on('preloader:close', closePreloader);
@ -42,6 +47,7 @@ const LongActionsController = inject('storeAppOptions')(({storeAppOptions}) => {
api.asc_unregisterCallback('asc_onOpenDocumentProgress', onOpenDocument); api.asc_unregisterCallback('asc_onOpenDocumentProgress', onOpenDocument);
} }
Common.Notifications.off('engineCreated', on_engine_created);
Common.Notifications.off('preloader:endAction', onLongActionEnd); Common.Notifications.off('preloader:endAction', onLongActionEnd);
Common.Notifications.off('preloader:beginAction', onLongActionBegin); Common.Notifications.off('preloader:beginAction', onLongActionBegin);
Common.Notifications.off('preloader:close', closePreloader); Common.Notifications.off('preloader:close', closePreloader);

8
apps/spreadsheeteditor/mobile/src/controller/add/AddFunction.jsx
View file

@ -15,6 +15,11 @@ class _FunctionGroups extends Component {
this.api = Common.EditorApi.get(); this.api = Common.EditorApi.get();
this.init(); this.init();
}); });
Common.Notifications.on('changeRegSettings', () => {
this.api = Common.EditorApi.get();
this.init();
});
} }
componentDidMount() { componentDidMount() {
Common.Notifications.on('document:ready', () => { Common.Notifications.on('document:ready', () => {
@ -46,7 +51,8 @@ class _FunctionGroups extends Component {
jsonDesc = data; jsonDesc = data;
} }
const grouparr = this.api.asc_getFormulasInfo(); 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`) fetch(`locale/l10n/functions/${this._editorLang}_desc.json`)

1
apps/spreadsheeteditor/mobile/src/controller/settings/ApplicationSettings.jsx
View file

@ -85,6 +85,7 @@ class ApplicationSettingsController extends Component {
LocalStorage.setItem("sse-settings-regional", regCode); LocalStorage.setItem("sse-settings-regional", regCode);
this.initRegSettings(); this.initRegSettings();
if (regCode!==null) api.asc_setLocale(+regCode); if (regCode!==null) api.asc_setLocale(+regCode);
Common.Notifications.trigger('changeRegSettings');
} }
render() { render() {

8
apps/spreadsheeteditor/mobile/src/store/functions.js
View file

@ -10,11 +10,11 @@ export class storeFunctions {
functions = {}; functions = {};
initFunctions (groups, data) { initFunctions (groups, data, separator) {
this.functions = this.getFunctions(groups, data); this.functions = this.getFunctions(groups, data, separator);
} }
getFunctions (groups, data) { getFunctions (groups, data, separator) {
const functions = {}; const functions = {};
for (let g in groups) { for (let g in groups) {
const group = groups[g]; const group = groups[g];
@ -28,7 +28,7 @@ export class storeFunctions {
type: _name, type: _name,
group: groupname, group: groupname,
caption: func.asc_getLocaleName(), 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 : '' descr: (data && data[_name]) ? data[_name].d : ''
}; };
} }