diff options
| -rw-r--r-- | media/js/views/room.js | 2 | ||||
| -rw-r--r-- | media/js/views/window.js | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/media/js/views/room.js b/media/js/views/room.js index e374c7a..741b26a 100644 --- a/media/js/views/room.js +++ b/media/js/views/room.js @@ -282,7 +282,7 @@ message.own = this.client.user.id === message.owner.id; // WHATS MY NAME - message.mentioned = new RegExp('\\B@(' + this.client.user.get('username') + ')(?!@)\\b', 'i').test(message.text); + message.mentioned = new RegExp('\\B@(' + this.client.user.get('username') + '|all)(?!@)\\b', 'i').test(message.text); // Templatin' time var $html = $(this.messageTemplate(message).trim()); diff --git a/media/js/views/window.js b/media/js/views/window.js index 872359a..3a455b5 100644 --- a/media/js/views/window.js +++ b/media/js/views/window.js @@ -80,10 +80,8 @@ this.flashFaviconBadge(); }, countMessage: function(message) { - var username = this.client.user.get('username'), - regex = new RegExp('\\B@(' + username + ')(?!@)\\b', 'i'); ++this.count; - regex.test(message.text) && ++this.mentions; + message.mentioned && ++this.mentions; }, flashTitle: function() { var titlePrefix = ''; |