From 4f5bb559512b0430800d54e40746472c3747c5ee Mon Sep 17 00:00:00 2001 From: Pavel Djundik Date: Fri, 14 Oct 2016 18:49:08 +0300 Subject: [PATCH] Revert "Do not trigger a DOM event on every message" --- client/js/lounge.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/client/js/lounge.js b/client/js/lounge.js index 34e55817..164e6134 100644 --- a/client/js/lounge.js +++ b/client/js/lounge.js @@ -355,14 +355,17 @@ $(function() { var target = "#chan-" + data.chan; var container = chat.find(target + " .messages"); - container.append(msg); + container + .append(msg) + .trigger("msg", [ + target, + data.msg + ]); if (data.msg.self) { container .find(".unread-marker") .appendTo(container); - } else { - chatMessageShown(target, data.msg); } }); @@ -951,7 +954,11 @@ $(function() { }); }); - function chatMessageShown(target, msg) { + chat.on("msg", ".messages", function(e, target, msg) { + if (msg.self) { + return; + } + var button = sidebar.find(".chan[data-target='" + target + "']"); if (msg.highlight || (options.notifyAllMessages && msg.type === "message")) { if (!document.hasFocus() || !$(target).hasClass("active")) { @@ -1015,7 +1022,7 @@ $(function() { badge.addClass("highlight"); } } - } + }); chat.on("click", ".show-more-button", function() { var self = $(this);