diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-15 17:50:27 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-15 17:50:27 +0100 |
| commit | 7f5c7ddea9db879e500a48b47ad4f782d2d8416b (patch) | |
| tree | 3332c614902b5641451da530ac9d2a3bed538a15 /webclient/room/room.html | |
| parent | Fix some of the tests to reflect changes in the storage layer. (diff) | |
| parent | Get presence for members when you enter a room (it was coming down but wasn't... (diff) | |
| download | synapse-7f5c7ddea9db879e500a48b47ad4f782d2d8416b.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Diffstat (limited to 'webclient/room/room.html')
| -rw-r--r-- | webclient/room/room.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html index 93917071d9..e2a4c221c6 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -20,9 +20,9 @@ </table> </div> - <div class="messageTableWrapper"> - <table class="messageTable"> - <tr ng-repeat="msg in events.rooms[room_id].messages" ng-class="msg.user_id === state.user_id ? 'mine' : ''"> + <div class="messageTableWrapper" keep-scroll> + <table class="messageTable" infinite-scroll="paginateMore()"> + <tr ng-repeat="msg in events.rooms[room_id].messages" ng-class="msg.user_id === state.user_id ? 'mine' : ''" scroll-item> <td class="leftBlock"> <div class="sender" ng-hide="events.rooms[room_id].messages[$index - 1].user_id === msg.user_id">{{ members[msg.user_id].displayname || msg.user_id }}</div> <div class="timestamp">{{ msg.content.hsob_ts | date:'MMM d HH:mm:ss' }}</div> |