Merge pull request #661 from thelounge/xpaw/no-dom-event

Do not trigger a DOM event on every message
This commit is contained in:
Jérémie Astori 2016-10-08 16:35:14 -04:00 committed by GitHub
commit e9d7d77cbd

View File

@ -352,17 +352,14 @@ $(function() {
var target = "#chan-" + data.chan; var target = "#chan-" + data.chan;
var container = chat.find(target + " .messages"); var container = chat.find(target + " .messages");
container container.append(msg);
.append(msg)
.trigger("msg", [
target,
data.msg
]);
if (data.msg.self) { if (data.msg.self) {
container container
.find(".unread-marker") .find(".unread-marker")
.appendTo(container); .appendTo(container);
} else {
chatMessageShown(target, data.msg);
} }
}); });
@ -951,11 +948,7 @@ $(function() {
}); });
}); });
chat.on("msg", ".messages", function(e, target, msg) { function chatMessageShown(target, msg) {
if (msg.self) {
return;
}
var button = sidebar.find(".chan[data-target='" + target + "']"); var button = sidebar.find(".chan[data-target='" + target + "']");
if (msg.highlight || (options.notifyAllMessages && msg.type === "message")) { if (msg.highlight || (options.notifyAllMessages && msg.type === "message")) {
if (!document.hasFocus() || !$(target).hasClass("active")) { if (!document.hasFocus() || !$(target).hasClass("active")) {
@ -1019,7 +1012,7 @@ $(function() {
badge.addClass("highlight"); badge.addClass("highlight");
} }
} }
}); }
chat.on("click", ".show-more-button", function() { chat.on("click", ".show-more-button", function() {
var self = $(this); var self = $(this);