summary refs log tree commit diff
path: root/webclient
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-08 14:01:34 -0700
committerKegan Dougal <kegan@matrix.org>2014-09-08 14:01:34 -0700
commita3590dfa262d0113a354591676942e05c20b5cbf (patch)
tree92369eb9bcaa005f640b4b78f1147dab8392da39 /webclient
parentAdded big massive TODOs on a huge design problem with initial sync (diff)
downloadsynapse-a3590dfa262d0113a354591676942e05c20b5cbf.tar.xz
Bodge to default to '1 users' when you create a room, which is better than blindly assuming a recents controller is writing to rootScope.rooms and setting numUsersInRoom there.
Diffstat (limited to 'webclient')
-rw-r--r--webclient/recents/recents-controller.js5
-rw-r--r--webclient/recents/recents.html2
2 files changed, 6 insertions, 1 deletions
diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js
index b4762acd1d..701c935742 100644
--- a/webclient/recents/recents-controller.js
+++ b/webclient/recents/recents-controller.js
@@ -82,6 +82,11 @@ angular.module('RecentsController', ['matrixService', 'matrixFilter', 'eventHand
         eventHandlerService.waitForInitialSyncCompletion().then(
             function(initialSyncData) {
             
+                // XXX FIXME TODO:
+                // Any assignments to the rootScope here should be done in
+                // event handler service and not here, because we could have
+                // many controllers manipulating and clobbering each other, and
+                // are unecessarily repeating http requests.
                 var rooms = initialSyncData.data.rooms;
                 for (var i=0; i<rooms.length; i++) {
                     var room = rooms[i];
diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html
index efc5c39689..4972e401f6 100644
--- a/webclient/recents/recents.html
+++ b/webclient/recents/recents.html
@@ -9,7 +9,7 @@
                     {{ room.room_id | mRoomName }}
                 </td>
                 <td class="recentsRoomSummaryTS">
-                    {{ room.numUsersInRoom }} {{ room.numUsersInRoom == 1 ? 'user' : 'users' }}
+                    {{ room.numUsersInRoom || '1' }} {{ room.numUsersInRoom == 1 ? 'user' : 'users' }}
                 </td>
                 <td class="recentsRoomSummaryTS">
                     {{ (room.lastMsg.ts) | date:'MMM d HH:mm' }}