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

[PE mobile] Bug 47978

Browse source
This commit is contained in:
SergeyEzhin 2021-05-31 18:08:02 +03:00
parent 36f75e01ed
commit 27dc6495a4
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/common/mobile/lib/controller/collaboration/Comments.jsx
View file

@ -558,10 +558,20 @@ class ViewCommentsController extends Component {
break; break;
} }
} }
showComment (comment) {
const api = Common.EditorApi.get();
api.asc_selectComment(comment.uid);
api.asc_showComment(comment.uid, false);
}
render() { render() {
return( return(
<Fragment> <Fragment>
{this.props.allComments && <ViewComments onCommentMenuClick={this.onCommentMenuClick} onResolveComment={this.onResolveComment} />} {this.props.allComments && <ViewComments onCommentMenuClick={this.onCommentMenuClick} onResolveComment={this.onResolveComment}
showComment={this.showComment} />}
{this.state.isOpenViewCurComments && <ViewCurrentComments opened={this.state.isOpenViewCurComments} {this.state.isOpenViewCurComments && <ViewCurrentComments opened={this.state.isOpenViewCurComments}
closeCurComments={this.closeViewCurComments} closeCurComments={this.closeViewCurComments}
onCommentMenuClick={this.onCommentMenuClick} onCommentMenuClick={this.onCommentMenuClick}

5
apps/common/mobile/lib/view/collaboration/Comments.jsx
View file

@ -626,7 +626,7 @@ const pickLink = (message) => {
} }
// View comments // View comments
const ViewComments = ({storeComments, storeAppOptions, onCommentMenuClick, onResolveComment}) => { const ViewComments = ({storeComments, storeAppOptions, onCommentMenuClick, onResolveComment, showComment}) => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('Common.Collaboration', {returnObjects: true}); const _t = t('Common.Collaboration', {returnObjects: true});
const isAndroid = Device.android; const isAndroid = Device.android;
@ -657,7 +657,8 @@ const ViewComments = ({storeComments, storeAppOptions, onCommentMenuClick, onRes
<List className='comment-list'> <List className='comment-list'>
{sortComments.map((comment, indexComment) => { {sortComments.map((comment, indexComment) => {
return ( return (
<ListItem key={`comment-${indexComment}`}> <ListItem key={`comment-${indexComment}`} onClick={e => {
!e.target.closest('.comment-menu') && !e.target.closest('.reply-menu') ? showComment(comment) : null}}>
<div slot='header' className='comment-header'> <div slot='header' className='comment-header'>
<div className='left'> <div className='left'>
{isAndroid && <div className='initials' style={{backgroundColor: `${comment.userColor ? comment.userColor : '#cfcfcf'}`}}>{comment.userInitials}</div>} {isAndroid && <div className='initials' style={{backgroundColor: `${comment.userColor ? comment.userColor : '#cfcfcf'}`}}>{comment.userInitials}</div>}