Merge branch 'develop' into server2server_signing

1 files changed, 8 insertions, 73 deletions

diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js
index 0f27f7a660..ee8a41c366 100644
--- a/webclient/recents/recents-controller.js
+++ b/webclient/recents/recents-controller.js
@@ -16,81 +16,16 @@
 
 'use strict';
 
-angular.module('RecentsController', ['matrixService', 'matrixFilter', 'eventHandlerService'])
-.controller('RecentsController', ['$scope', 'matrixService', 'eventHandlerService', 
-                               function($scope,  matrixService, eventHandlerService) {
-    $scope.rooms = {};
+angular.module('RecentsController', ['matrixService', 'matrixFilter'])
+.controller('RecentsController', ['$rootScope', '$scope', 'eventHandlerService', 
+                               function($rootScope, $scope, eventHandlerService) {
 
-    // $scope of the parent where the recents component is included can override this value
-    // in order to highlight a specific room in the list
-    $scope.recentsSelectedRoomID;
-
-    var listenToEventStream = function() {
-        // Refresh the list on matrix invitation and message event
-        $scope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) {
-            if (isLive) {
-                $scope.rooms[event.room_id].lastMsg = event;
-            }
-        });
-        $scope.$on(eventHandlerService.MSG_EVENT, function(ngEvent, event, isLive) {
-            if (isLive) {
-                $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;
-            }
-        });
-        $scope.$on(eventHandlerService.ROOM_CREATE_EVENT, function(ngEvent, event, isLive) {
-            if (isLive) {
-                $scope.rooms[event.room_id] = event;
-            }
-        });
-    };
-
-    
-    var refresh = function() {
-        // List all rooms joined or been invited to
-        // TODO: This is a pity that event-stream-service.js makes the same call
-        // We should be able to reuse event-stream-service.js fetched data
-        matrixService.rooms(1, false).then(
-            function(response) {
-                // Reset data
-                $scope.rooms = {};
-
-                var rooms = response.data.rooms;
-                for (var i=0; i<rooms.length; i++) {
-                    var room = rooms[i];
-                    
-                    // Add room_alias & room_display_name members
-                    $scope.rooms[room.room_id] = angular.extend(room, matrixService.getRoomAliasAndDisplayName(room));
+    // Expose the service to the view
+    $scope.eventHandlerService = eventHandlerService;
 
-                    // Create a shortcut for the last message of this room
-                    if (room.messages && room.messages.chunk && room.messages.chunk[0]) {
-                        $scope.rooms[room.room_id].lastMsg = room.messages.chunk[0];
-                    }
-                }
-
-                var presence = response.data.presence;
-                for (var i = 0; i < presence.length; ++i) {
-                    eventHandlerService.handleEvent(presence[i], false);
-                }
-
-                // From now, update recents from the stream
-                listenToEventStream();
-            },
-            function(error) {
-                $scope.feedback = "Failure: " + error.data;
-            }
-        );
-    };
+    // $rootScope of the parent where the recents component is included can override this value
+    // in order to highlight a specific room in the list
+    $rootScope.recentsSelectedRoomID;
 
-    $scope.onInit = function() {
-        eventHandlerService.waitForInitialSyncCompletion().then(function() {
-            refresh();
-        });
-    };
-    
 }]);