From 96da42085cc77e9f75009ea6152bc1bc64a2dcc8 Mon Sep 17 00:00:00 2001 From: Emmanuel ROHEE Date: Wed, 20 Aug 2014 17:08:05 +0200 Subject: BF: Wait for the room_id being resolved before starting pagination --- webclient/room/room-controller.js | 4 ++-- 1 file 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) { -- cgit 1.4.1