summary refs log tree commit diff
path: root/webclient/room
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-16 14:32:50 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-16 15:35:23 +0100
commit660364d6a7a4ad69bbb951990c20fc38d168e588 (patch)
treecb732865c5fed8b796528dc66d3c9885abc88511 /webclient/room
parentAdded a section on bing words if you enable desktop notifications. (diff)
downloadsynapse-660364d6a7a4ad69bbb951990c20fc38d168e588.tar.xz
Move the notification logic out of an individual room controller and into the general event handler, so we can notify for >1 room.
Diffstat (limited to '')
-rw-r--r--webclient/room/room-controller.js16
1 files changed, 0 insertions, 16 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index 4a91d298bc..4a1dfd6aac 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -139,22 +139,6 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
         if (isLive && event.room_id === $scope.room_id) {
             
             scrollToBottom();
-            
-            if (window.Notification) {
-                // Show notification when the window is hidden, or the user is idle
-                if (document.hidden || matrixService.presence.unavailable === mPresence.getState()) {
-                    var notification = new window.Notification(
-                        ($scope.members[event.user_id].displayname || event.user_id) +
-                        " (" + ($scope.room_alias || $scope.room_id) + ")", // FIXME: don't leak room_ids here
-                    {
-                        "body": event.content.body,
-                        "icon": $scope.members[event.user_id].avatar_url
-                    });
-                    $timeout(function() {
-                        notification.close();
-                    }, 5 * 1000);
-                }
-            }
         }
     });