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

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

Browse source 
[SSE] Fix Bug 56629
This commit is contained in:
maxkadushkin 2022-04-23 12:07:23 +03:00 committed by GitHub
parent a93e3d4844 6c9db53785
commit c8e85d1d57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/mobile/src/controller/Main.jsx
View file

@ -688,7 +688,7 @@ class MainController extends Component {
this.api.asc_registerCallback('asc_onGetDocInfoEnd', () => { this.api.asc_registerCallback('asc_onGetDocInfoEnd', () => {
clearTimeout(this.timerLoading); clearTimeout(this.timerLoading);
clearInterval(this.timerDocInfo); clearInterval(this.timerDocInfo);
storeDocumentInfo.switchIsLoaded(true); storeDocumentInfo.changeCount(this.objectInfo);
}); });
// Color Schemes // Color Schemes

14
apps/spreadsheeteditor/mobile/src/controller/Error.jsx
View file

@ -222,6 +222,7 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu
case Asc.c_oAscError.ID.DataValidate: case Asc.c_oAscError.ID.DataValidate:
errData && errData.asc_getErrorTitle() && (config.title = Common.Utils.String.htmlEncode(errData.asc_getErrorTitle())); errData && errData.asc_getErrorTitle() && (config.title = Common.Utils.String.htmlEncode(errData.asc_getErrorTitle()));
config.buttons = ['OK', 'Cancel'];
config.msg = errData && errData.asc_getError() ? Common.Utils.String.htmlEncode(errData.asc_getError()) : _t.errorDataValidate; config.msg = errData && errData.asc_getError() ? Common.Utils.String.htmlEncode(errData.asc_getError()) : _t.errorDataValidate;
break; break;
@ -350,8 +351,9 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu
Common.Gateway.reportWarning(id, config.msg); Common.Gateway.reportWarning(id, config.msg);
config.title = config.title || _t.notcriticalErrorTitle; config.title = config.title || _t.notcriticalErrorTitle;
config.callback = (btn) => { config.buttons = config.buttons || ['OK'];
if (id == Asc.c_oAscError.ID.DataValidate) { config.callback = (_, btn) => {
if (id == Asc.c_oAscError.ID.DataValidate && btn.target.textContent !== 'OK') {
api.asc_closeCellEditor(true); api.asc_closeCellEditor(true);
} }
storeAppOptions.changeEditingRights(false); storeAppOptions.changeEditingRights(false);
@ -362,12 +364,12 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu
cssClass: 'error-dialog', cssClass: 'error-dialog',
title : config.title, title : config.title,
text : config.msg, text : config.msg,
buttons: [ buttons: config.buttons.map( button => (
{ {
text: 'OK', text:button,
onClick: () => config.callback onClick: (_, btn) => config.callback(_, btn)
} }
] ))
}).open(); }).open();
Common.component.Analytics.trackEvent('Internal Error', id.toString()); Common.component.Analytics.trackEvent('Internal Error', id.toString());