From 012293438dc4fe0b347e012970eb1187502d3fa3 Mon Sep 17 00:00:00 2001 From: sostler Date: Mon, 1 Feb 2010 20:56:43 -0500 Subject: Fixed msg_id setting; re-added msg content escaping; don't make image tag for empty avatars --- static/js/pichat.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'static') 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 '
' + '' + nick + ': ' @@ -237,8 +237,13 @@ function initProfile() { data: { 'attr': attr, 'val': newVal } }); if (attr == 'avatar') { - var s = ''; - $('#avatarPic').replaceWith(s); + console.log(newVal); + if (newVal != "") { + var s = ''; + $('#avatarPic').replaceWith(s).show(); + } else { + $('#avatarPic').hide(); + } } return escapeHtml(newVal); }; -- cgit v1.2.3-70-g09d2