deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-15 20:15:11 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2580 from thelounge/xpaw/title-fixes

Browse source 
Reset highlights on self messages; update title when other client opens a channel
This commit is contained in:
Jérémie Astori 2018-06-21 21:00:44 -04:00 committed by GitHub
parent 3e029c4e8a d00cf72614
commit f2acae4ce1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
client/js/socket-events/msg.js
View file

@ -97,7 +97,12 @@ function processReceivedMessage(data) {
// Clear unread/highlight counter if self-message
if (data.msg.self) {
sidebarTarget.find(".badge").removeClass("highlight").empty();
sidebarTarget.find(".badge")
.attr("data-highlight", 0)
.removeClass("highlight")
.empty();
utils.updateTitle();
}
let messageLimit = 0;
@ -211,12 +216,12 @@ function notifyMessage(targetId, channel, msg) {
return;
}
const badge = button.find(".badge").html(helpers_roundBadgeNumber(serverUnread));
const badge = button.find(".badge")
.attr("data-highlight", serverHighlight)
.html(helpers_roundBadgeNumber(serverUnread));
if (msg.highlight) {
badge
.attr("data-highlight", serverHighlight)
.addClass("highlight");
badge.addClass("highlight");
utils.updateTitle();
}

3
client/js/socket-events/open.js
View file

@ -2,6 +2,7 @@
const $ = require("jquery");
const socket = require("../socket");
const utils = require("../utils");
// Sync unread badge and marker when other clients open a channel
socket.on("open", function(id) {
@ -22,6 +23,8 @@ socket.on("open", function(id) {
.removeClass("highlight")
.empty();
utils.updateTitle();
// Move unread marker to the bottom
channel
.find(".unread-marker")