Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

autoscroll down(if the scroller was already at the bottom) when receiving member events

Browse Source
This commit is contained in:
Emmanuel ROHEE 2014-09-05 17:52:11 +02:00
parent 3a88808983
commit 12a23f01b4
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
webclient/room/room-controller.js
View File

@ -42,23 +42,24 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
$scope.imageURLToSend = ""; $scope.imageURLToSend = "";
$scope.userIDToInvite = ""; $scope.userIDToInvite = "";
var scrollToBottom = function() { var scrollToBottom = function(force) {
console.log("Scrolling to bottom"); console.log("Scrolling to bottom");
$timeout(function() {
var objDiv = document.getElementById("messageTableWrapper"); // Do not autoscroll to the bottom to display the new event if the user is not at the bottom.
objDiv.scrollTop = objDiv.scrollHeight; // Exception: in case where the event is from the user, we want to force scroll to the bottom
}, 0); var objDiv = document.getElementById("messageTableWrapper");
if ((objDiv.offsetHeight + objDiv.scrollTop >= objDiv.scrollHeight) || force) {
$timeout(function() {
objDiv.scrollTop = objDiv.scrollHeight;
}, 0);
}
}; };
$scope.$on(eventHandlerService.MSG_EVENT, function(ngEvent, event, isLive) { $scope.$on(eventHandlerService.MSG_EVENT, function(ngEvent, event, isLive) {
if (isLive && event.room_id === $scope.room_id) { if (isLive && event.room_id === $scope.room_id) {
// Do not autoscroll to the bottom to display this new event if the user is not at the bottom. scrollToBottom();
// Exception: if the event is from the user, scroll to the bottom
var objDiv = document.getElementById("messageTableWrapper");
if ( (objDiv.offsetHeight + objDiv.scrollTop >= objDiv.scrollHeight) || event.user_id === $scope.state.user_id) {
scrollToBottom();
}
if (window.Notification) { if (window.Notification) {
// Show notification when the user is idle // Show notification when the user is idle
@ -80,6 +81,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
$scope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) { $scope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) {
if (isLive) { if (isLive) {
scrollToBottom();
updateMemberList(event); updateMemberList(event);
} }
}); });
@ -288,6 +290,8 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
return; return;
} }
scrollToBottom(true);
var promise; var promise;
var isCmd = false; var isCmd = false;
@ -614,6 +618,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
}; };
$scope.sendImage = function(url, body) { $scope.sendImage = function(url, body) {
scrollToBottom(true);
matrixService.sendImageMessage($scope.room_id, url, body).then( matrixService.sendImageMessage($scope.room_id, url, body).then(
function() { function() {