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

[DE PE SSE mobile] Fix Bug 51134

Browse source
This commit is contained in:
SergeyEzhin 2021-07-09 19:04:06 +03:00
parent 55e8fbea42
commit 662ee6d9a5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
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 href="${subStr}" 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 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 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(item1,item2){ return item1.start - item2.start; }); arrayComment = arrayComment.sort(function(item1,item2){ return item1.start - item2.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>{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;