From e50ed3ebcc2204accda4e9f034ab26305eabdec3 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 30 Mar 2022 18:45:06 +0400 Subject: [PATCH 1/2] [common] Fix Bug 56305 --- apps/common/mobile/lib/view/About.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/common/mobile/lib/view/About.jsx b/apps/common/mobile/lib/view/About.jsx index 3dd4cac9a..f553ab95c 100644 --- a/apps/common/mobile/lib/view/About.jsx +++ b/apps/common/mobile/lib/view/About.jsx @@ -58,7 +58,7 @@ const PageAbout = props => { {mailCustomer && mailCustomer.length ? (

- {mailCustomer} + {mailCustomer}

) : null} {urlCustomer && urlCustomer.length ? ( @@ -103,11 +103,11 @@ const PageAbout = props => {

- {__SUPPORT_EMAIL__} + {__SUPPORT_EMAIL__}

- {__PUBLISHER_PHONE__} + {__PUBLISHER_PHONE__}

{publisherPrintUrl} From b8f6ae7d3abe195b74869ce4181cb02bf558971b Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Thu, 31 Mar 2022 20:38:01 +0400 Subject: [PATCH 2/2] [DE PE SSE mobile] Fix Bug 53597 --- apps/common/mobile/lib/controller/ContextMenu.jsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/common/mobile/lib/controller/ContextMenu.jsx b/apps/common/mobile/lib/controller/ContextMenu.jsx index 94cce47c8..9a41688bc 100644 --- a/apps/common/mobile/lib/controller/ContextMenu.jsx +++ b/apps/common/mobile/lib/controller/ContextMenu.jsx @@ -105,6 +105,9 @@ class ContextMenuController extends Component { onApiOpenContextMenu(x, y) { if ( !this.state.opened && $$('.dialog.modal-in, .popover.modal-in, .sheet-modal.modal-in, .popup.modal-in, #pe-preview, .add-comment-popup, .actions-modal.modal-in').length < 1) { + const subNav = document.querySelector('.subnavbar'); + const rect = subNav.getBoundingClientRect(); + this.setState({ items: this.initMenuItems(), extraItems: this.initExtraItems() @@ -112,8 +115,8 @@ class ContextMenuController extends Component { if ( this.state.items.length > 0 ) { const api = Common.EditorApi.get(); - - this.$targetEl.css({left: `${x}px`, top: `${y}px`}); + + this.$targetEl.css({left: `${x}px`, top: y < rect.bottom ? `${rect.bottom}px` : `${y}px`}); const popover = f7.popover.open(idContextMenuElement, idCntextMenuTargetElement); if (Device.android)