Fixed msg_id setting; re-added msg content escaping; don't make image tag for empty avatars

1 files changed, 9 insertions, 4 deletions

diff --git a/static/js/pichat.js b/static/js/pichat.js
index 01ae492..2804919 100755
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -22,12 +22,12 @@ function linkReplace(match){
 }
 
 function buildMsgContent(content) {
-    return linkify(content)
+    return linkify(escapeHtml(content));
 }
 
 function buildMessageDiv(msg, isLoading) {
     var nick = escapeHtml(msg.nick);
-    var msgId = !isLoading ? 'id="message-' + msg.message_id + '"' : '';
+    var msgId = !isLoading ? 'id="message-' + msg.msg_id + '"' : '';
     var loadingClass = isLoading ? ' loading' : '';
     return '<div class="msgDiv ' + loadingClass + '" ' + msgId  + '>'
         + '<b><a href="/u/' + nick + ' ">' + nick + '</a>: </b>'
@@ -237,8 +237,13 @@ function initProfile() {
             data: { 'attr': attr, 'val': newVal }
         });
         if (attr == 'avatar') {
-            var s = '<img id="avatarPic" src="' + newVal + '" width="150" />';
-            $('#avatarPic').replaceWith(s);
+            console.log(newVal);
+            if (newVal != "") {
+                var s = '<img id="avatarPic" src="' + newVal + '" width="150" />';
+                $('#avatarPic').replaceWith(s).show();
+            } else {
+                $('#avatarPic').hide();
+            }
         }
         return escapeHtml(newVal);
     };