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

Merge pull request #334 from thelounge/xpaw/query-highlights

Browse Source 
Fix notifications in query windows
This commit is contained in:
Max-P 2016-05-21 22:09:55 -04:00
commit 423151ad97
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/css/style.css
View File

@ -901,9 +901,9 @@ button,
#chat .error, #chat .error,
#chat .error .from, #chat .error .from,
#chat .highlight .from, #chat .channel .highlight .from,
#chat .highlight .text, #chat .channel .highlight .text,
#chat .highlight .user { #chat .channel .highlight .user {
color: #f00; color: #f00;
} }

3
client/js/lounge.js
View File

@ -827,8 +827,7 @@ $(function() {
} }
} }
button = button.filter(":not(.active)"); if (button.hasClass("active")) {
if (button.length === 0) {
return; return;
} }

4
client/themes/morning.css
View File

@ -192,8 +192,8 @@ QUIT #d0907d
#chat .error, #chat .error,
#chat .error .from, #chat .error .from,
#chat .highlight, #chat .channel .highlight,
#chat .highlight .from { #chat .channel .highlight .from {
color: #f92772; color: #f92772;
} }

4
client/themes/zenburn.css
View File

@ -222,8 +222,8 @@ body {
#chat .error, #chat .error,
#chat .error .from, #chat .error .from,
#chat .highlight, #chat .channel .highlight,
#chat .highlight .from { #chat .channel .highlight .from {
color: #bc6c4c; color: #bc6c4c;
} }

9
src/plugins/irc-events/message.js
View File

@ -46,7 +46,6 @@ module.exports = function(irc, network) {
if (data.type === Msg.Type.NOTICE) { if (data.type === Msg.Type.NOTICE) {
chan = network.channels[0]; chan = network.channels[0];
} else { } else {
highlight = !self;
chan = new Chan({ chan = new Chan({
type: Chan.Type.QUERY, type: Chan.Type.QUERY,
name: target name: target
@ -58,10 +57,14 @@ module.exports = function(irc, network) {
}); });
} }
} }
}
// Query messages (unless self) always highlight // Query messages (unless self) always highlight
// Self messages are never highlighted if (chan.type === Chan.Type.QUERY) {
highlight = !self;
}
}
// Self messages in channels are never highlighted
// Non-self messages are highlighted as soon as the nick is detected // Non-self messages are highlighted as soon as the nick is detected
if (!highlight && !self) { if (!highlight && !self) {
highlight = network.highlightRegex.test(data.message); highlight = network.highlightRegex.test(data.message);