summary refs log tree commit diff
path: root/webclient/room
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-09-04 11:19:28 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-09-04 13:43:48 +0200
commit7346ea85c08d0153644398be8d271169351b0c57 (patch)
treede83a64605e54a652db3520c15f6e51600def7d6 /webclient/room
parentRe-apply fixes to the link-email screen to make it work again (in a somewhat ... (diff)
downloadsynapse-7346ea85c08d0153644398be8d271169351b0c57.tar.xz
Moved mRoomName filter into matrix-filter.js, a place for all generic filters using Matrix data.
Diffstat (limited to 'webclient/room')
-rw-r--r--webclient/room/room-controller.js2
-rw-r--r--webclient/room/room.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index c3f72c9d25..cdef9ab8a1 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-angular.module('RoomController', ['ngSanitize', 'mFileInput'])
+angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
 .controller('RoomController', ['$scope', '$timeout', '$routeParams', '$location', '$rootScope', 'matrixService', 'eventHandlerService', 'mFileUpload', 'mPresence', 'matrixPhoneService', 'MatrixCall',
                                function($scope, $timeout, $routeParams, $location, $rootScope, matrixService, eventHandlerService, mFileUpload, mPresence, matrixPhoneService, MatrixCall) {
    'use strict';
diff --git a/webclient/room/room.html b/webclient/room/room.html
index 6732a7b3ae..493884f601 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -3,7 +3,7 @@
     <div id="roomHeader">
         <a href ng-click="goToPage('/')"><img src="img/logo-small.png" width="100" height="43" alt="[matrix]"/></a>
         <div id="roomName">
-            {{ room_id  | roomName }}
+            {{ room_id  | mRoomName }}
         </div>
     </div>