From d03d6fb7a5b150c9fa783568af35b8c41c0b27a9 Mon Sep 17 00:00:00 2001 From: lilia Date: Fri, 1 Jan 2016 06:14:25 -0800 Subject: [PATCH] Fix autolinking for urls with non-English characters Fixes #559 https://url.spec.whatwg.org/#url-code-points // FREEBIE --- js/views/message_view.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/views/message_view.js b/js/views/message_view.js index 8bdaf0c87..daec0e2de 100644 --- a/js/views/message_view.js +++ b/js/views/message_view.js @@ -5,6 +5,8 @@ 'use strict'; window.Whisper = window.Whisper || {}; + var URL_REGEX = /(^|[\s\n]|)((?:https?|ftp):\/\/[\-A-Z0-9\u00A0-\uD7FF\uE000-\uFDCF\uFDF0-\uFFFD+\u0026\u2019@#\/%?=()~_|!:,.;]*[\-A-Z0-9+\u0026@#\/%=~()_|])/gi; + Whisper.MessageView = Whisper.View.extend({ tagName: "li", templateName: 'message', @@ -89,7 +91,7 @@ var content = this.$('.content'); var escaped = content.html(); - content.html(escaped.replace(/\n/g, '
').replace(/(^|[\s\n]|)((?:https?|ftp):\/\/[\-A-Z0-9+\u0026\u2019@#\/%?=()~_|!:,.;]*[\-A-Z0-9+\u0026@#\/%=~()_|])/gi, "$1$2")); + content.html(escaped.replace(/\n/g, '
').replace(URL_REGEX, "$1$2")); this.renderSent(); this.renderDelivered();