diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2014-10-17 23:53:24 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2014-10-17 23:53:24 +0100 |
| commit | e9abbe89f3fd465089b2840d954d93fba933a44a (patch) | |
| tree | 44a565001fa7065cd2f4dd284754e01b6285d654 /webclient/recents | |
| parent | fix webclient to know about right timestamps (diff) | |
| download | synapse-e9abbe89f3fd465089b2840d954d93fba933a44a.tar.xz | |
more timestamp fixes
Diffstat (limited to 'webclient/recents')
| -rw-r--r-- | webclient/recents/recents-filter.js | 4 | ||||
| -rw-r--r-- | webclient/recents/recents.html | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webclient/recents/recents-filter.js b/webclient/recents/recents-filter.js index 468a746b18..ef8d9897f7 100644 --- a/webclient/recents/recents-filter.js +++ b/webclient/recents/recents-filter.js @@ -59,9 +59,9 @@ angular.module('RecentsController') return 1; } else { - return lastMsgRoomB.ts - lastMsgRoomA.ts; + return lastMsgRoomB.origin_server_ts - lastMsgRoomA.origin_server_ts; } }); return filtered; }; -}]); \ No newline at end of file +}]); diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html index 9cbdcd357a..fe6a2f6368 100644 --- a/webclient/recents/recents.html +++ b/webclient/recents/recents.html @@ -18,7 +18,7 @@ Declaring it in this way ensures the data-binding --> {{ lastMsg = eventHandlerService.getLastMessage(room.room_id, true);"" }} - {{ (lastMsg.ts) | date:'MMM d HH:mm' }} + {{ (lastMsg.origin_server_ts) | date:'MMM d HH:mm' }} <img ng-click="leave(room.room_id); $event.stopPropagation();" src="img/close.png" width="10" height="10" style="margin-bottom: -1px; margin-left: 2px;" alt="close"/> </td> |