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

Fix Bug 47237 modification v3

Browse source
This commit is contained in:
ShimaginAndrey 2021-05-25 12:07:02 +03:00
parent 14220fe977
commit 1850ecfdca
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -578,7 +578,7 @@ const pickLink = (message) => {
if (result) if (result)
subStr = subStr.substring(0, result.index); subStr = subStr.substring(0, result.index);
offset = arguments[arguments.length-2]; offset = arguments[arguments.length-2];
arrayComment.push({start: offset, end: subStr.length+offset, str: '<a onclick="window.open(href).focus()" href="' + subStr + '" target="_blank" data-can-copy="true">' + subStr + '</a>'}); arrayComment.push({start: offset, end: subStr.length+offset, str: <a onClick={() => window.open(subStr)} href={subStr} target="_blank" data-can-copy="true">{subStr}</a>});
return ''; return '';
}); });
@ -595,7 +595,7 @@ const pickLink = (message) => {
(offset<=item.start) && (offset+len>item.start)); (offset<=item.start) && (offset+len>item.start));
}); });
if (!elem) if (!elem)
arrayComment.push({start: offset, end: len+offset, str: '<a onclick="window.open(href).focus()" href="' + ref + '" target="_blank" data-can-copy="true">' + subStr + '</a>'}); arrayComment.push({start: offset, end: len+offset, str: <a onClick={() => window.open(ref)} href={ref} target="_blank" data-can-copy="true">{subStr}</a>});
return ''; return '';
}); });
@ -608,20 +608,20 @@ const pickLink = (message) => {
(offset<=item.start) && (offset+len>item.start)); (offset<=item.start) && (offset+len>item.start));
}); });
if (!elem) if (!elem)
arrayComment.push({start: offset, end: len+offset, str: '<a onclick="window.open(href).focus()" href="' + ref + '">' + subStr + '</a>'}); arrayComment.push({start: offset, end: len+offset, str: <a onClick={() => window.open(ref)} href={ref}>{subStr}</a>});
return ''; return '';
}); });
arrayComment = arrayComment.sort(function(item){ return item.start; }); arrayComment = arrayComment.sort(function(item){ return item.start; });
let str_res = (arrayComment.length>0) ? ( Common.Utils.String.htmlEncode(message.substring(0, arrayComment[0].start)) + arrayComment[0].str) : Common.Utils.String.htmlEncode(message); let str_res = (arrayComment.length>0) ? <label>{Common.Utils.String.htmlEncode(message.substring(0, arrayComment[0].start))} {arrayComment[0].str}</label> : <label>{Common.Utils.String.htmlEncode(message)}</label>;
for (var i=1; i<arrayComment.length; i++) { for (var i=1; i<arrayComment.length; i++) {
str_res += (Common.Utils.String.htmlEncode(message.substring(arrayComment[i-1].end, arrayComment[i].start)) + arrayComment[i].str); str_res = <label>{str_res} {Common.Utils.String.htmlEncode(message.substring(arrayComment[i-1].end, arrayComment[i].start))} {arrayComment[i].str}</label>;
} }
if (arrayComment.length>0) { if (arrayComment.length>0) {
str_res += Common.Utils.String.htmlEncode(message.substring(arrayComment[i-1].end, message.length)); str_res = <label>{str_res} {Common.Utils.String.htmlEncode(message.substring(arrayComment[i-1].end, message.length))}</label>;
} }
return str_res; return str_res;
} }
// View comments // View comments
@ -668,7 +668,7 @@ const ViewComments = ({storeComments, storeAppOptions, onCommentMenuClick, onRes
</div> </div>
<div slot='footer'> <div slot='footer'>
{comment.quote && <div className='comment-quote'>{sliceQuote(comment.quote)}</div>} {comment.quote && <div className='comment-quote'>{sliceQuote(comment.quote)}</div>}
<div className='comment-text' dangerouslySetInnerHTML={{__html: pickLink(comment.comment)}}></div> <div className='comment-text'>{pickLink(comment.comment)}</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) => {
@ -698,7 +698,7 @@ const ViewComments = ({storeComments, storeAppOptions, onCommentMenuClick, onRes
} }
</div> </div>
<div slot='footer'> <div slot='footer'>
<div className='reply-text' dangerouslySetInnerHTML={{__html: pickLink(reply.reply)}}></div> <div className='reply-text'><pre>{pickLink(reply.reply)}</pre></div>
</div> </div>
</div> </div>
</div> </div>
@ -790,7 +790,7 @@ const CommentList = inject("storeComments", "storeAppOptions")(observer(({storeC
</div> </div>
<div slot='footer'> <div slot='footer'>
{comment.quote && <div className='comment-quote'>{sliceQuote(comment.quote)}</div>} {comment.quote && <div className='comment-quote'>{sliceQuote(comment.quote)}</div>}
<div className='comment-text' dangerouslySetInnerHTML={{__html: pickLink(comment.comment)}}></div> <div className='comment-text'>{pickLink(comment.comment)}</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) => {
@ -820,7 +820,7 @@ const CommentList = inject("storeComments", "storeAppOptions")(observer(({storeC
} }
</div> </div>
<div slot='footer'> <div slot='footer'>
<div className='reply-text' dangerouslySetInnerHTML={{__html: pickLink(reply.reply)}}></div> <div className='reply-text'><pre>{pickLink(reply.reply)}</pre></div>
</div> </div>
</div> </div>
</div> </div>