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

Merge pull request #1341 from ONLYOFFICE/feature/bug-fixes

Browse source 
Feature/bug fixes
This commit is contained in:
maxkadushkin 2021-11-23 10:58:38 +03:00 committed by GitHub
parent f7187db16a 2aca892017
commit 983c2a94a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,8 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu
}); });
const onError = (id, level, errData) => { const onError = (id, level, errData) => {
const api = Common.EditorApi.get();
api.asc_enableKeyEvents(false);
if (id === Asc.c_oAscError.ID.LoadingScriptError) { if (id === Asc.c_oAscError.ID.LoadingScriptError) {
f7.notification.create({ f7.notification.create({
@ -31,8 +33,6 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu
Common.Notifications.trigger('preloader:close'); Common.Notifications.trigger('preloader:close');
Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument,true); Common.Notifications.trigger('preloader:endAction', Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument,true);
const api = Common.EditorApi.get();
const config = { const config = {
closable: false closable: false
}; };
@ -357,7 +357,10 @@ const ErrorController = inject('storeAppOptions')(({storeAppOptions, LoadingDocu
buttons: [ buttons: [
{ {
text: 'OK', text: 'OK',
onClick: config.callback onClick: () => {
api.asc_enableKeyEvents(true);
config.callback;
}
} }
] ]
}).open(); }).open();

2
apps/spreadsheeteditor/mobile/src/view/CellEditor.jsx
View file

@ -109,7 +109,7 @@ const CellEditorView = props => {
</div> </div>
<div className="ce-group group--content" style={contentStyle}> <div className="ce-group group--content" style={contentStyle}>
<div id="idx-list-target" className="target-function-list"></div> <div id="idx-list-target" className="target-function-list"></div>
<textarea id="idx-cell-content" spellCheck="false" /> <textarea id="idx-cell-content" spellCheck="false" onFocus={(e) => {wsLock && e.target.blur()}}/>
</div> </div>
<div className="ce-group"> <div className="ce-group">
<Link icon="caret" onClick={expandClick} /> <Link icon="caret" onClick={expandClick} />