summary refs log tree commit diff
path: root/webclient/recents/recents-controller.js
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-09-01 16:31:09 +0100
committerMark Haines <mark.haines@matrix.org>2014-09-01 16:31:09 +0100
commit46dcb0d8902c531e3b187453435913fc6e2344a9 (patch)
tree1bfb42952b976731888fb06a49e253d1037fa827 /webclient/recents/recents-controller.js
parentListen using SSL (diff)
parentmissing semicolon (diff)
downloadsynapse-46dcb0d8902c531e3b187453435913fc6e2344a9.tar.xz
Merge branch 'develop' into server2server_tls
Diffstat (limited to 'webclient/recents/recents-controller.js')
-rw-r--r--webclient/recents/recents-controller.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js
index d33d41a922..c9fd022d7f 100644
--- a/webclient/recents/recents-controller.js
+++ b/webclient/recents/recents-controller.js
@@ -43,6 +43,11 @@ angular.module('RecentsController', ['matrixService', 'eventHandlerService'])
                 $scope.rooms[event.room_id].lastMsg = event;              
             }
         });
+        $scope.$on(eventHandlerService.CALL_EVENT, function(ngEvent, event, isLive) {
+            if (isLive) {
+                $scope.rooms[event.room_id].lastMsg = event;
+            }
+        });
     };