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

Merge pull request #2033 from ONLYOFFICE/feature/fix-bugs

Browse source 
Feature/fix bugs
This commit is contained in:
maxkadushkin 2022-11-03 15:38:20 +03:00 committed by GitHub
parent af0456e4c7 f905e891d5
commit dcd37e4731
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/mobile/src/view/edit/Edit.jsx
View file

@ -378,7 +378,7 @@ const EditView = props => {
<Popover id="edit-popover" className="popover__titled" closeByOutsideClick={false} onPopoverClosed={() => props.onClosed()}> <Popover id="edit-popover" className="popover__titled" closeByOutsideClick={false} onPopoverClosed={() => props.onClosed()}>
<EditTabsContainer inPopover={true} onOptionClick={onOptionClick} style={{height: '410px'}} /> <EditTabsContainer inPopover={true} onOptionClick={onOptionClick} style={{height: '410px'}} />
</Popover> : </Popover> :
<Sheet id="edit-sheet" push onSheetClosed={() => props.onClosed()}> <Sheet id="edit-sheet" closeByOutsideClick={true} closeByBackdropClick={false} backdrop={false} push onSheetClosed={() => props.onClosed()}>
<EditTabsContainer onOptionClick={onOptionClick} /> <EditTabsContainer onOptionClick={onOptionClick} />
</Sheet> </Sheet>
) )

4
apps/spreadsheeteditor/mobile/locale/en.json
View file

@ -243,7 +243,9 @@
"unknownErrorText": "Unknown error.", "unknownErrorText": "Unknown error.",
"uploadImageExtMessage": "Unknown image format.", "uploadImageExtMessage": "Unknown image format.",
"uploadImageFileCountMessage": "No images uploaded.", "uploadImageFileCountMessage": "No images uploaded.",
"uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB." "uploadImageSizeMessage": "The image is too big. The maximum size is 25 MB.",
"textCancel": "Cancel",
"textOk": "Ok"
}, },
"LongActions": { "LongActions": {
"advDRMPassword": "Password", "advDRMPassword": "Password",

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

@ -368,12 +368,17 @@ 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: config.buttons.map( button => ( buttons: config.buttons ? config.buttons.map(button => (
{ {
text:button, text: button,
onClick: (_, btn) => config.callback(_, btn) onClick: (_, btn) => config.callback(_, btn)
} }
)) )) : [
{
text: t('Error.textOk'),
onClick: (dlg, _) => dlg.close()
}
]
}).open(); }).open();
Common.component.Analytics.trackEvent('Internal Error', id.toString()); Common.component.Analytics.trackEvent('Internal Error', id.toString());

2
apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx
View file

@ -114,7 +114,7 @@ const EditCell = props => {
}}> }}>
{!isAndroid && <Icon slot="media" icon="icon-cell-style" />} {!isAndroid && <Icon slot="media" icon="icon-cell-style" />}
<div slot="after"> <div slot="after">
<div className='preview-cell-style' style={{backgroundImage: `url(${curStyle.image})`}}></div> <div className='preview-cell-style' style={{backgroundImage: `url(${curStyle ? curStyle.image : null})`}}></div>
</div> </div>
</ListItem> </ListItem>
</List> </List>