mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Update link handling

Browse source
This commit is contained in:
Scott Nonnenberg 2018-05-11 12:12:46 -07:00
parent d8e0a489b2
commit c00c939148
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
js/views/message_view.js
View file

@ -19,6 +19,8 @@
window.Whisper = window.Whisper || {}; window.Whisper = window.Whisper || {};
const URL_REGEX = /(^|[\s\n]|<br\/?>)((?:https?|ftp):\/\/[-A-Z0-9\u00A0-\uD7FF\uE000-\uFDCF\uFDF0-\uFFFD+\u0026\u2019@#/%?=()~_|!:,.;]*[-A-Z0-9+\u0026@#/%=~()_|])/gi;
const ErrorIconView = Whisper.View.extend({ const ErrorIconView = Whisper.View.extend({
templateName: 'error-icon', templateName: 'error-icon',
className: 'error-icon-container', className: 'error-icon-container',
@ -593,7 +595,11 @@
if (body.length > 0) { if (body.length > 0) {
const escapedBody = body.html(); const escapedBody = body.html();
body.html(Signal.HTML.render(escapedBody)); body.html(
escapedBody
.replace(/\n/g, '<br>')
.replace(URL_REGEX, "$1<a href='$2' target='_blank'>$2</a>")
);
} }
this.renderSent(); this.renderSent();