Merge pull request #369 from Sudrien/feature/extend_updateWindowOnAllMessages

Feature/extend update window on all messages

1 files changed, 5 insertions, 3 deletions

diff --git a/src/view/pane/message.js b/src/view/pane/message.js
index 2e3a851..b4bcbb6 100644
--- a/src/view/pane/message.js
+++ b/src/view/pane/message.js
@@ -218,11 +218,13 @@ Candy.View.Pane = (function(self, $) {
 
         // Check to see if in-core notifications are disabled
         if(!Candy.Core.getOptions().disableCoreNotifications) {
-          // Notify the user about a new private message
           if(Candy.View.getCurrent().roomJid !== roomJid || !self.Window.hasFocus()) {
             self.Chat.increaseUnreadMessages(roomJid);
-            if(Candy.View.Pane.Chat.rooms[roomJid].type === 'chat' && !self.Window.hasFocus()) {
-              self.Chat.Toolbar.playSound();
+            if(!self.Window.hasFocus()) {
+              // Notify the user about a new private message OR on all messages if configured
+              if(Candy.View.Pane.Chat.rooms[roomJid].type === 'chat' || Candy.View.getOptions().updateWindowOnAllMessages === true) {
+                self.Chat.Toolbar.playSound();
+              }
             }
           }
         }