1 files changed, 3 insertions, 2 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index 3cc127140b..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 {
@@ -598,6 +598,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
promise.then(
function(response) {
console.log("Request successfully sent");
+
if (echo) {
// Mark this fake message event with its allocated event_id
// When the true message event will come from the events stream (in handleMessage),
|
