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

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

Browse source 
[DE mobile] Fix Bug 55393
This commit is contained in:
maxkadushkin 2022-02-14 15:23:34 +03:00 committed by GitHub
parent c605a302b6 6ca7553b3f
commit d289d26bcb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -267,7 +267,7 @@ class ContextMenu extends ContextMenuController {
});
}
if ( canFillForms && !locked ) {
if ( canFillForms && canCopy && !locked ) {
itemsIcon.push({
event: 'paste',
icon: 'icon-paste'

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

@ -111,22 +111,24 @@ const EditCell = props => {
</List>
<BlockTitle>{_t.textCellStyles}</BlockTitle>
{cellStyles.length ? (
<Swiper pagination>
{arraySlides.map((_, indexSlide) => {
let stylesSlide = cellStyles.slice(indexSlide * 9, (indexSlide * 9) + 9);
return (
<SwiperSlide key={indexSlide}>
<List className="cell-styles-list">
{stylesSlide.map((elem, index) => (
<ListItem key={index} className={elem.name === styleName ? "item-theme active" : "item-theme"} onClick={() => props.onStyleClick(elem.name)}>
<div className='thumb' style={{backgroundImage: `url(${elem.image})`}}></div>
</ListItem>
))}
</List>
</SwiperSlide>
)})}
</Swiper>
<div className="swiper-container swiper-init demo-swiper">
<div className="swiper-wrapper">
{arraySlides.map((_, indexSlide) => {
let stylesSlide = cellStyles.slice(indexSlide * 9, (indexSlide * 9) + 9);
return (
<div className="swiper-slide" key={indexSlide}>
<List className="cell-styles-list">
{stylesSlide.map((elem, index) => (
<ListItem key={index} className={elem.name === styleName ? "item-theme active" : "item-theme"} onClick={() => props.onStyleClick(elem.name)}>
<div className='thumb' style={{backgroundImage: `url(${elem.image})`}}></div>
</ListItem>
))}
</List>
</div>
)})}
</div>
</div>
) : null}
</>}
</Fragment>