summary refs log tree commit diff
path: root/webclient
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-08-18 17:14:43 +0100
committerMatthew Hodgson <matthew@matrix.org>2014-08-18 20:56:27 +0100
commitcdc5ffe2a2457e50790ab73cf4ceffa0c552a14d (patch)
tree1407085df7ebbd2ec16f75e1dac7693b5c398ab2 /webclient
parentSmall amounts of cleanup and bonus round comments. (diff)
downloadsynapse-cdc5ffe2a2457e50790ab73cf4ceffa0c552a14d.tar.xz
show private room_ids rather than nulls in notifs if there is no room_alias
Diffstat (limited to 'webclient')
-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 d130a28fd7..1414fbbe6a 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,