summary refs log tree commit diff
path: root/webclient/room
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-16 15:15:19 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-16 15:35:23 +0100
commita402e0c5e6e432a175b48279c972bc9ae7e944bc (patch)
tree5611d5d4bb86b546f27485c14086a6cdd2ad5288 /webclient/room
parentMove the notification logic out of an individual room controller and into the... (diff)
downloadsynapse-a402e0c5e6e432a175b48279c972bc9ae7e944bc.tar.xz
Added bing detection logic. Persist the display name of the user in localstorage for use when binging.
Diffstat (limited to 'webclient/room')
-rw-r--r--webclient/room/room-controller.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index 4a1dfd6aac..f82f4aed27 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
-.controller('RoomController', ['$filter', '$scope', '$timeout', '$routeParams', '$location', '$rootScope', 'matrixService', 'eventHandlerService', 'mFileUpload', 'mPresence', 'matrixPhoneService', 'MatrixCall',
-                               function($filter, $scope, $timeout, $routeParams, $location, $rootScope, matrixService, eventHandlerService, mFileUpload, mPresence, matrixPhoneService, MatrixCall) {
+.controller('RoomController', ['$filter', '$scope', '$timeout', '$routeParams', '$location', '$rootScope', 'matrixService', 'eventHandlerService', 'mFileUpload', 'matrixPhoneService', 'MatrixCall',
+                               function($filter, $scope, $timeout, $routeParams, $location, $rootScope, matrixService, eventHandlerService, mFileUpload, matrixPhoneService, MatrixCall) {
    'use strict';
     var MESSAGES_PER_PAGINATION = 30;
     var THUMBNAIL_SIZE = 320;