summaryrefslogtreecommitdiff
path: root/static/js/src/chat.js
diff options
context:
space:
mode:
authordumpfmprod <dumpfmprod@ubuntu.(none)>2014-06-28 12:22:17 -0400
committerdumpfmprod <dumpfmprod@ubuntu.(none)>2014-06-28 12:22:17 -0400
commitb04eea907242bb895f9578638f5f05612311fa66 (patch)
tree8af5175552815e15149cdfe9b7d31aab273946b7 /static/js/src/chat.js
parent0f957d316cfae62f9cfabc8df1d26e906de3e553 (diff)
fix bug where personal mutes didnt affect .oldmsg divs
Diffstat (limited to 'static/js/src/chat.js')
-rw-r--r--static/js/src/chat.js14
1 files changed, 11 insertions, 3 deletions
diff --git a/static/js/src/chat.js b/static/js/src/chat.js
index e59e948..b2816c7 100644
--- a/static/js/src/chat.js
+++ b/static/js/src/chat.js
@@ -2,6 +2,7 @@
function initChat() {
Search.initInpage()
+ initMutes()
$('#textbutton input').attr('checked', TextEnabled).change(setTextEnable);
$('#imgbutton input').attr('checked', ImgsEnabled).change(setImgsEnable);
@@ -19,10 +20,17 @@ function initChat() {
MessageContentCache[dump.attr("id").substr(8)] = content.text()
content.html(buildMsgContent(content.text(), Recips));
- if ((ImgsEnabled && dump.hasClass('contains-image')) || (TextEnabled && !dump.hasClass('contains-image')))
- dump.show();
- else
+ if ((ImgsEnabled && dump.hasClass('contains-image')) || (TextEnabled && !dump.hasClass('contains-image'))) {
+ if (dump.attr('nick') in MUTES) {
+ dump.hide();
+ }
+ else {
+ dump.show();
+ }
+ }
+ else {
dump.hide();
+ }
});
Drag.bindImages();