Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-05-27 19:23:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix highlights in focused rooms

Browse Source 
While they needn`t raise popups, they should still format the chat messages.
This commit is contained in:
Ivo Julca 2015-11-17 10:51:11 -05:00
parent dec3e8305e
commit 33dd5259bb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/client-chat.js
View File

@ -1353,7 +1353,7 @@
this.lastMessageDate = Math.max(this.lastMessageDate || 0, msgTime);
}
var isHighlighted = mayNotify && userid !== app.user.get('userid') && this.getHighlight(message);
var isHighlighted = userid !== app.user.get('userid') && this.getHighlight(message);
var parsedMessage = Tools.parseChatMessage(message, name, ChatRoom.getTimestamp('chat', msgTime), isHighlighted);
if (!$.isArray(parsedMessage)) parsedMessage = [parsedMessage];
for (var i = 0; i < parsedMessage.length; i++) {
@ -1361,7 +1361,7 @@
this.$chat.append(parsedMessage[i]);
}
if (isHighlighted) {
if (mayNotify && isHighlighted) {
var $lastMessage = this.$chat.children().last();
var notifyTitle = "Mentioned by " + name + (this.id === 'lobby' ? '' : " in " + this.title);
var notifyText = $lastMessage.html().indexOf('<span class="spoiler">') >= 0 ? '(spoiler)' : $lastMessage.children().last().text();