diff --git a/apps/common/mobile/lib/controller/ContextMenu.jsx b/apps/common/mobile/lib/controller/ContextMenu.jsx index c5b580e22d..dd16ee1bec 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').length < 1 && !$$('.popover.modal-in, .sheet-modal.modal-in').length) { + 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 db68b4ff1e..066216d2cd 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}); }); }