summary refs log tree commit diff
path: root/syweb/webclient/recents/recents-controller.js
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-11-17 10:21:51 +0000
committerMark Haines <mark.haines@matrix.org>2014-11-17 10:21:51 +0000
commit1d3ef8734cea9a1ce8befdf27db297ca70cfeee3 (patch)
tree12c7ac945749c68b81e3ae55c39dfd58ae824bf0 /syweb/webclient/recents/recents-controller.js
parentMerge PDUs and Events into one object (diff)
parentMove getLastMessage to modelService. (diff)
downloadsynapse-1d3ef8734cea9a1ce8befdf27db297ca70cfeee3.tar.xz
Merge remote-tracking branch 'origin/develop' into merge_pdu_event_objects
Diffstat (limited to 'syweb/webclient/recents/recents-controller.js')
-rw-r--r--syweb/webclient/recents/recents-controller.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/syweb/webclient/recents/recents-controller.js b/syweb/webclient/recents/recents-controller.js

index 41720d4cb0..6b2915d03b 100644 --- a/syweb/webclient/recents/recents-controller.js +++ b/syweb/webclient/recents/recents-controller.js
@@ -17,11 +17,11 @@ 'use strict'; angular.module('RecentsController', ['matrixService', 'matrixFilter']) -.controller('RecentsController', ['$rootScope', '$scope', 'eventHandlerService', 'modelService', 'recentsService', - function($rootScope, $scope, eventHandlerService, modelService, recentsService) { +.controller('RecentsController', ['$rootScope', '$scope', 'modelService', 'recentsService', + function($rootScope, $scope, modelService, recentsService) { // Expose the service to the view - $scope.eventHandlerService = eventHandlerService; + $scope.modelService = modelService; // retrieve all rooms and expose them $scope.rooms = modelService.getRooms();