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

[DE mobile] Fix Bug 58665

Browse source
This commit is contained in:
SergeyEzhin 2022-08-24 17:36:14 +03:00
parent 63d942c238
commit 158cd48e0b
1 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -677,7 +677,7 @@ const ViewComments = inject("storeComments", "storeAppOptions", "storeReview")(o
</div> </div>
{isEdit && !viewMode && {isEdit && !viewMode &&
<div className='right'> <div className='right'>
{(comment.editable && displayMode === 'markup' && !wsProps?.Objects) && <div className='comment-resolve' onClick={() => {!isViewer && onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'} /></div> } {(comment.editable && displayMode === 'markup' && !wsProps?.Objects && !isViewer) && <div className='comment-resolve' onClick={() => {onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'} /></div> }
{(displayMode === 'markup' && !wsProps?.Objects && !isViewer) && {(displayMode === 'markup' && !wsProps?.Objects && !isViewer) &&
<div className='comment-menu' <div className='comment-menu'
onClick={() => {setComment(comment); openActionComment(true);}}> onClick={() => {setComment(comment); openActionComment(true);}}>
@ -808,7 +808,7 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob
</div> </div>
{isEdit && !viewMode && {isEdit && !viewMode &&
<div className='right'> <div className='right'>
{(comment.editable && displayMode === 'markup' && !wsProps?.Objects) && <div className='comment-resolve' onClick={() => {!isViewer && onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'}/></div>} {(comment.editable && displayMode === 'markup' && !wsProps?.Objects && !isViewer) && <div className='comment-resolve' onClick={() => {onResolveComment(comment);}}><Icon icon={comment.resolved ? 'icon-resolve-comment check' : 'icon-resolve-comment'}/></div>}
{(displayMode === 'markup' && !wsProps?.Objects && !isViewer) && {(displayMode === 'markup' && !wsProps?.Objects && !isViewer) &&
<div className='comment-menu' <div className='comment-menu'
onClick={() => {openActionComment(true);}}> onClick={() => {openActionComment(true);}}>
@ -822,43 +822,43 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob
{comment.quote && <div className='comment-quote'>{sliceQuote(comment.quote)}</div>} {comment.quote && <div className='comment-quote'>{sliceQuote(comment.quote)}</div>}
<div className='comment-text'><pre>{pickLink(comment.comment)}</pre></div> <div className='comment-text'><pre>{pickLink(comment.comment)}</pre></div>
{comment.replies.length > 0 && {comment.replies.length > 0 &&
<ul className='reply-list'> <ul className='reply-list'>
{comment.replies.map((reply, indexReply) => { {comment.replies.map((reply, indexReply) => {
return ( return (
<li key={`reply-${indexReply}`} <li key={`reply-${indexReply}`}
className='reply-item' className='reply-item'
> >
<div className='item-content'> <div className='item-content'>
<div className='item-inner'> <div className='item-inner'>
<div className='item-title'> <div className='item-title'>
<div slot='header' className='reply-header'> <div slot='header' className='reply-header'>
<div className='left'> <div className='left'>
{isAndroid && <div className='initials' style={{backgroundColor: `${reply.userColor ? reply.userColor : '#cfcfcf'}`}}>{reply.userInitials}</div>} {isAndroid && <div className='initials' style={{backgroundColor: `${reply.userColor ? reply.userColor : '#cfcfcf'}`}}>{reply.userInitials}</div>}
<div> <div>
<div className='user-name'>{reply.parsedName}</div> <div className='user-name'>{reply.parsedName}</div>
<div className='reply-date'>{reply.date}</div> <div className='reply-date'>{reply.date}</div>
</div>
</div>
{isEdit && !viewMode && reply.editable && !isViewer &&
<div className='right'>
<div className='reply-menu'
onClick={() => {setReply(reply); openActionReply(true);}}
>
<Icon icon='icon-menu-comment'/>
</div> </div>
</div> </div>
} {isEdit && !viewMode && reply.editable && !isViewer &&
</div> <div className='right'>
<div slot='footer'> <div className='reply-menu'
<div className='reply-text'><pre>{pickLink(reply.reply)}</pre></div> onClick={() => {setReply(reply); openActionReply(true);}}
>
<Icon icon='icon-menu-comment'/>
</div>
</div>
}
</div>
<div slot='footer'>
<div className='reply-text'><pre>{pickLink(reply.reply)}</pre></div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </li>
</li> )
) })}
})} </ul>
</ul>
} }
</div> </div>
</ListItem> </ListItem>