diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-18 00:25:57 +0200 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-18 00:25:57 +0200 |
| commit | f05dce54a71cefdc1af63a8f196d65c2906a827f (patch) | |
| tree | ddf7c730400d5dbab6cf1a5e4f48977e2b446e12 /webclient/room/room.html | |
| parent | I can't type apparently (diff) | |
| parent | fix webclient to know about right timestamps (diff) | |
| download | synapse-f05dce54a71cefdc1af63a8f196d65c2906a827f.tar.xz | |
Merge pull request #9 from matrix-org/develop
Fix issue with timestamps in webclient
Diffstat (limited to 'webclient/room/room.html')
| -rw-r--r-- | webclient/room/room.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html index 79a60585a5..a3f8aee7ab 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -68,7 +68,6 @@ ng-hide="state.permission_denied" ng-style="{ 'visibility': state.messages_visibility }" keep-scroll> - <!-- FIXME: need to have better timestamp semantics than the (msg.content.hsob_ts || msg.ts) hack below --> <table id="messageTable" infinite-scroll="paginateMore()"> <tr ng-repeat="msg in events.rooms[room_id].messages" ng-class="(events.rooms[room_id].messages[$index + 1].user_id !== msg.user_id ? 'differentUser' : '') + (msg.user_id === state.user_id ? ' mine' : '')" scroll-item> @@ -76,7 +75,7 @@ <div class="sender" ng-hide="events.rooms[room_id].messages[$index - 1].user_id === msg.user_id"> {{ msg.user_id | mUserDisplayName: room_id }}</div> <div class="timestamp" ng-class="msg.echo_msg_state"> - {{ (msg.content.hsob_ts || msg.ts) | date:'MMM d HH:mm' }} + {{ (msg.origin_server_ts) | date:'MMM d HH:mm' }} </div> </td> <td class="avatar"> |