summary refs log tree commit diff
path: root/syweb/webclient/home
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-11-13 14:37:43 +0000
committerDavid Baker <dbkr@matrix.org>2014-11-13 14:37:43 +0000
commitcdb8d746efe602eb1b993a0310b4cf20c2a78995 (patch)
tree38d8df3a56a5a415a4b24c98b7e6b2b38f24c76d /syweb/webclient/home
parentKill ng-animate with fire because it's terrible (was causing the page to be v... (diff)
parentAdd commands-service unit tests. (diff)
downloadsynapse-cdb8d746efe602eb1b993a0310b4cf20c2a78995.tar.xz
Merge with Matthew's killing of ng-animate
Conflicts:
	syweb/webclient/app-controller.js
	syweb/webclient/index.html
Diffstat (limited to 'syweb/webclient/home')
-rw-r--r--syweb/webclient/home/home-controller.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/syweb/webclient/home/home-controller.js b/syweb/webclient/home/home-controller.js
index 6a3c079295..a9538a0309 100644
--- a/syweb/webclient/home/home-controller.js
+++ b/syweb/webclient/home/home-controller.js
@@ -17,8 +17,8 @@ limitations under the License.
 'use strict';
 
 angular.module('HomeController', ['matrixService', 'eventHandlerService', 'RecentsController'])
-.controller('HomeController', ['$scope', '$location', 'matrixService', 'eventHandlerService', 'modelService',
-                               function($scope, $location, matrixService, eventHandlerService, modelService) {
+.controller('HomeController', ['$scope', '$location', 'matrixService', 'eventHandlerService', 'modelService', 'recentsService',
+                               function($scope, $location, matrixService, eventHandlerService, modelService, recentsService) {
 
     $scope.config = matrixService.config();
     $scope.public_rooms = [];
@@ -46,6 +46,8 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen
     $scope.newChat = {
         user: ""
     };
+    
+    recentsService.setSelectedRoomId(undefined);
 
     var refresh = function() {