summary refs log tree commit diff
path: root/webclient/room/room.html
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-10-17 23:11:55 +0100
committerMatthew Hodgson <matthew@matrix.org>2014-10-17 23:11:55 +0100
commit514e0fd4b675cbb2ed36687095daa047730c60d8 (patch)
treee9efd10eb6b9264d6fbe98db5d9da0ff23b2931c /webclient/room/room.html
parentMerge branch 'release-v0.4.0' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-514e0fd4b675cbb2ed36687095daa047730c60d8.tar.xz
fix webclient to know about right timestamps
Diffstat (limited to '')
-rw-r--r--webclient/room/room.html3
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">