annoying caps

1 files changed, 2 insertions, 2 deletions

diff --git a/static/js/pichat.js b/static/js/pichat.js
index 3659d37..fefaca1 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -47,7 +47,8 @@ function isCSSPropertySupported(prop){ return prop in document.body.style }
 
 function escapeHtml(txt) {
     if (!txt) { return ""; }
-    else { return $("<span>").text(txt).html(); }
+    txt = annoyingCaps(txt)
+    return $("<span>").text(txt).html()
 }
 
 URLRegex = /((\b(http\:\/\/|https\:\/\/|ftp\:\/\/)|(www\.))+(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?)/gi;
@@ -68,7 +69,6 @@ function getImagesAsArray(text) {
 
 function linkify(text) {
     LastMsgContainsImage = false
-    text = annoyingCaps(text)
     text = text.replace(URLRegex, linkReplace);
     return text
 }