summary refs log tree commit diff
path: root/webclient/room
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-08-20 17:08:05 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-08-20 17:08:18 +0200
commit96da42085cc77e9f75009ea6152bc1bc64a2dcc8 (patch)
tree0311c474393077d4c90343140182628abc924153 /webclient/room
parentUse the "collect_presencelike_data" distributor signal instead of re-implemen... (diff)
downloadsynapse-96da42085cc77e9f75009ea6152bc1bc64a2dcc8.tar.xz
BF: Wait for the room_id being resolved before starting pagination
Diffstat (limited to '')
-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 558a865f30..35abeeca06 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -89,7 +89,7 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
         
     var paginate = function(numItems) {
         // console.log("paginate " + numItems);
-        if ($scope.state.paginating) {
+        if ($scope.state.paginating || !$scope.room_id) {
             return;
         }
         else {
@@ -145,7 +145,7 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
                 console.log("Failed to paginateBackMessages: " + JSON.stringify(error));
                 $scope.state.paginating = false;
             }
-        )
+        );
     };
 
     var updateMemberList = function(chunk) {