From 2ab7e23790e416f16ea3ba939dd6a91bb8cfa936 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 18 Sep 2014 18:17:27 +0100
Subject: [PATCH] fix SYWEB-41 (hopefully)
---
webclient/room/room-controller.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index cfdc6d0157..ac8f767d16 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -703,7 +703,13 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
if ($rootScope.events.rooms[$scope.room_id]) {
// There is no need to do a 1st pagination (initialSync provided enough to fill a page)
- $scope.state.first_pagination = false;
+ if ($rootScope.events.rooms[$scope.room_id].messages.length) {
+ $scope.state.first_pagination = false;
+ }
+ else {
+ // except if we just joined a room, we won't have this history from initial sync, so we should try to paginate it anyway
+ $scope.state.first_pagination = true;
+ }
var members = $rootScope.events.rooms[$scope.room_id].members;
--
GitLab