From a39655f0e8178172905b58157a7f1f954042b809 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 5 Jul 2021 23:01:51 +0300 Subject: [PATCH] [mobile] Fix bug 51099 --- apps/common/mobile/lib/controller/ContextMenu.jsx | 2 +- apps/common/mobile/lib/controller/collaboration/Comments.jsx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/common/mobile/lib/controller/ContextMenu.jsx b/apps/common/mobile/lib/controller/ContextMenu.jsx index 86cc8d9d4..dd16ee1be 100644 --- a/apps/common/mobile/lib/controller/ContextMenu.jsx +++ b/apps/common/mobile/lib/controller/ContextMenu.jsx @@ -104,7 +104,7 @@ 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').length < 1) { + if ( !this.state.opened && $$('.dialog.modal-in, .popover.modal-in, .sheet-modal.modal-in, .popup.modal-in, #pe-preview, .add-comment-popup').length < 1) { this.setState({ items: this.initMenuItems(), extraItems: this.initExtraItems() diff --git a/apps/common/mobile/lib/controller/collaboration/Comments.jsx b/apps/common/mobile/lib/controller/collaboration/Comments.jsx index db68b4ff1..066216d2c 100644 --- a/apps/common/mobile/lib/controller/collaboration/Comments.jsx +++ b/apps/common/mobile/lib/controller/collaboration/Comments.jsx @@ -254,6 +254,7 @@ class AddCommentController extends Component { }; Common.Notifications.on('addcomment', () => { + f7.popover.close('#idx-context-menu-popover'); //close context menu this.setState({isOpen: true}); }); }