From 32acb7e90304fccf85e2271fb0a6f60b1fadbaf7 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 13 Sep 2014 11:35:36 +0100
Subject: [PATCH] always scroll to bottom when entering a room

---
 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 45dfff95c2..50d902ae47 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -220,7 +220,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
     };
 
     var paginate = function(numItems) {
-        // console.log("paginate " + numItems);
+        //console.log("paginate " + numItems + " and first_pagination is " + $scope.state.first_pagination);
         if ($scope.state.paginating || !$scope.room_id) {
             return;
         }
@@ -260,7 +260,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
                 }
                 
                 if ($scope.state.first_pagination) {
-                    scrollToBottom();
+                    scrollToBottom(true);
                     $scope.state.first_pagination = false;
                 }
                 else {