Make messages list and room users list scroll-overflow

2 files changed, 13 insertions, 10 deletions

diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js

index f3836c536b..e54751ef6d 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -33,7 +33,8 @@ angular.module('RoomController', [])
                         }
                         $scope.messages.push(chunk);
                         $timeout(function() {
-                            window.scrollTo(0, document.body.scrollHeight);
+                            var objDiv = document.getElementsByClassName("messageTableWrapper")[0];
+                            objDiv.scrollTop = objDiv.scrollHeight;
                         },0);
                     }
                     else if (chunk.room_id == $scope.room_id && chunk.type == "m.room.member") {
diff --git a/webclient/room/room.html b/webclient/room/room.html

index 3439f1a786..276c3caa5a 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -6,15 +6,17 @@
         {{ room_alias || room_id }}
     </div>
     
-    <table class="usersTable">
-        <tr ng-repeat="(name, info) in members">
-            <td class="userAvatar">
-                <img class="userAvatarImage" ng-src="{{info.avatar_url || 'img/default-profile.jpg'}}" width="80" height="80"/>
-                <img class="userAvatarGradient" src="img/gradient.png" width="80" height="24"/>
-                <div class="userName">{{ info.displayname || name }}</div>
-            </td>
-            <td class="userPresence" ng-class="info.presenceState === 'online' ? 'online' : (info.presenceState === 'away' ? 'away' : '')" />
-    </table>
+    <div class="usersTableWrapper">
+        <table class="usersTable">
+            <tr ng-repeat="(name, info) in members">
+                <td class="userAvatar">
+                    <img class="userAvatarImage" ng-src="{{info.avatar_url || 'img/default-profile.jpg'}}" width="80" height="80"/>
+                    <img class="userAvatarGradient" src="img/gradient.png" width="80" height="24"/>
+                    <div class="userName">{{ info.displayname || name }}</div>
+                </td>
+                <td class="userPresence" ng-class="info.presenceState === 'online' ? 'online' : (info.presenceState === 'away' ? 'away' : '')" />
+        </table>
+    </div>
     
     <div class="messageTableWrapper">
         <table class="messageTable">