Refactor: JS init + HTTPS-safe URLs

1 files changed, 2 insertions, 6 deletions

diff --git a/static/js/src/text.js b/static/js/src/text.js
index 773eed4..f426255 100755
--- a/static/js/src/text.js
+++ b/static/js/src/text.js
@@ -103,11 +103,7 @@ function imgClickHandler() {
 // durty hack to use a global to check this... but otherwise i'd have to rewrite the String.replace function? :/
 var LastMsgContainsImage = false
 function linkReplace(url) {
-    var lowerurl = url.toLowerCase();
-    if (lowerurl.indexOf('http://') == 0 || lowerurl.indexOf('https://') == 0 || lowerurl.indexOf('ftp://') == 0)
-        linkUrl = url;
-    else
-        linkUrl = 'http://' + url;
+    linkUrl = normalizeUrl(url);
 
     var uri = parseUri(url)
     var type = getUriType(uri)
@@ -162,7 +158,7 @@ function linkifyWithoutImage(text) {
 
 function linkReplaceWithoutImage(url){
     var urlWithoutParams = url.replace(/\?.*$/i, "");
-    linkUrl = url.indexOf('http://') == 0 ? url : 'http://' + url;
+    linkUrl = normalizeUrl(url);
 
     return "<a target='_blank' href='" + linkUrl + "'>" + url + "</a>"
 }