oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-06-29 23:58:31 +00:00
Code Wiki Activity

An update!

Browse source
This commit is contained in:
SirStendec 2015-06-10 18:46:04 -04:00
parent 6264da62fc
commit b184fc74b2
15 changed files with 905 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/tokenize.js
View file

@ -19,7 +19,7 @@ try {
// Tokenization
// ---------------------
FFZ.prototype.tokenize_chat_line = function(msgObject) {
FFZ.prototype.tokenize_chat_line = function(msgObject, prevent_notification) {
if ( msgObject.cachedTokens )
return msgObject.cachedTokens;
@ -53,14 +53,14 @@ FFZ.prototype.tokenize_chat_line = function(msgObject) {
for(var i=0; i < tokens.length; i++) {
var token = tokens[i];
if ( _.isString(token) || ! token.mentionedUser || token.own )
if ( _.isString(token) || ! token.mentionedUser || token.own || msgObject.style === 'whisper' )
continue;
// We have a mention!
msgObject.ffz_has_mention = true;
// If we have chat tabs, update the status.
if ( ! this.has_bttv && this.settings.group_tabs && this._chatv && this._chatv._ffz_tabs ) {
if ( room_id && ! this.has_bttv && this.settings.group_tabs && this._chatv && this._chatv._ffz_tabs ) {
var el = this._chatv._ffz_tabs.querySelector('.ffz-chat-tab[data-room="' + room_id + '"]');
if ( el && ! el.classList.contains('active') )
el.classList.add('tab-mentioned');
@ -69,7 +69,7 @@ FFZ.prototype.tokenize_chat_line = function(msgObject) {
// Display notifications if that setting is enabled. Also make sure
// that we have a chat view because showing a notification when we
// can't actually go to it is a bad thing.
if ( this._chatv && this.settings.highlight_notifications && ! document.hasFocus() ) {
if ( this._chatv && this.settings.highlight_notifications && ! document.hasFocus() && ! prevent_notification ) {
var room = this.rooms[room_id] && this.rooms[room_id].room,
room_name;