summary refs log tree commit diff
path: root/webclient/room/room-controller.js
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-08-19 09:44:50 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-08-19 09:44:50 +0200
commitff21d4d93bfa76a8ad20660a3513a0f122905b12 (patch)
treefa63ee538b2ad5e18c414eabc98bebed0fdc54fa /webclient/room/room-controller.js
parentFill user page with avatar, display name and matrix id (diff)
parentshow private room_ids rather than nulls in notifs if there is no room_alias (diff)
downloadsynapse-ff21d4d93bfa76a8ad20660a3513a0f122905b12.tar.xz
Merge remote-tracking branch 'origin/master' into user_page
Diffstat (limited to 'webclient/room/room-controller.js')
-rw-r--r--webclient/room/room-controller.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index 8878c3d209..b585e338ed 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -147,7 +147,7 @@ angular.module('RoomController', ['ngSanitize'])
                 if (document.hidden) {
                     var notification = new window.Notification(
                         ($scope.members[event.user_id].displayname || event.user_id) +
-                        " (" + $scope.room_alias + ")",
+                        " (" + ($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,