Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improving urlify

Browse source
This commit is contained in:
David Négrier 2021-02-11 18:03:14 +01:00
parent c5916e7b6d
commit bc35ade8df
3 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
front/src/WebRtc/DiscussionManager.ts
View file

@ -170,7 +170,7 @@ export class DiscussionManager {
divMessage.appendChild(pMessage);
const userMessage: HTMLParagraphElement = document.createElement('p');
userMessage.append(HtmlUtils.urlify(message));
userMessage.innerHTML = HtmlUtils.urlify(message);
userMessage.classList.add('body');
divMessage.appendChild(userMessage);
this.divMessages?.appendChild(divMessage);

22
front/src/WebRtc/HtmlUtils.ts
View file

@ -24,19 +24,19 @@ export class HtmlUtils {
throw new Error("Cannot find HTML element with id '"+id+"'");
}
public static urlify(text: string): HTMLSpanElement {
const textReturn : HTMLSpanElement = document.createElement('span');
textReturn.innerText = text;
private static escapeHtml(html: string): string {
const text = document.createTextNode(html);
const p = document.createElement('p');
p.appendChild(text);
return p.innerHTML;
}
public static urlify(text: string): string {
const urlRegex = /(https?:\/\/[^\s]+)/g;
text.replace(urlRegex, (url: string) => {
const link : HTMLAnchorElement = document.createElement('a');
link.innerText = ` ${url}`;
link.href = url;
link.target = '_blank';
textReturn.append(link);
return url;
text = HtmlUtils.escapeHtml(text);
return text.replace(urlRegex, (url: string) => {
return '<a href="' + url + '" target="_blank" style=":visited {color: white}">' + url + '</a>';
});
return textReturn;
}
private static isHtmlElement<T extends HTMLElement>(elem: HTMLElement | null): elem is T {