summary refs log tree commit diff
path: root/webclient/recents
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-09-11 11:31:24 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-09-11 11:31:24 +0200
commit7e7eb0efc14733b576942af4590683c8b749e94e (patch)
treedee7a5bb61e42874c473f073998d981ef905c453 /webclient/recents
parentgetRoomEventIndex: improved speed for what it is used (diff)
downloadsynapse-7e7eb0efc14733b576942af4590683c8b749e94e.tar.xz
Show room topic change in the chat history and in the recents
Diffstat (limited to 'webclient/recents')
-rw-r--r--webclient/recents/recents-controller.js5
-rw-r--r--webclient/recents/recents.html4
2 files changed, 9 insertions, 0 deletions
diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js
index 5cf74cad4e..8ce0969164 100644
--- a/webclient/recents/recents-controller.js
+++ b/webclient/recents/recents-controller.js
@@ -68,6 +68,11 @@ angular.module('RecentsController', ['matrixService', 'matrixFilter', 'eventHand
                 $rootScope.rooms[event.room_id] = event;
             }
         });
+        $rootScope.$on(eventHandlerService.TOPIC_EVENT, function(ngEvent, event, isLive) {
+            if (isLive) {
+                $rootScope.rooms[event.room_id].lastMsg = event;
+            }
+        });
     };
     
     /**
diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html
index d6bea52cbe..6976bab879 100644
--- a/webclient/recents/recents.html
+++ b/webclient/recents/recents.html
@@ -76,6 +76,10 @@
                             </div>
                         </div>
 
+                        <div ng-switch-when="m.room.topic">
+                            {{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} changed the topic to: {{ room.lastMsg.content.topic }}
+                        </div>
+
                         <div ng-switch-default>
                             <div ng-if="room.lastMsg.type.indexOf('m.call.') === 0">
                                 Call