supernets/hardlounge
supernets
/
hardlounge
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Revert "Do not trigger a DOM event on every message"
This commit is contained in:
Pavel Djundik 2016-10-14 20:11:02 +03:00 committed by GitHub
parent 93c4c14b72 4f5bb55951
commit ebd70824f0
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client/js/lounge.js
View File

@ -355,14 +355,17 @@ $(function() {
var target = "#chan-" + data.chan; var target = "#chan-" + data.chan;
var container = chat.find(target + " .messages"); var container = chat.find(target + " .messages");
container.append(msg); container
.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,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 + "']"); 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")) {
@ -1015,7 +1022,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);