fix timestamps some more
Merge branch 'develop' of git+ssh://github.com/matrix-org/synapse
This commit is contained in:
commit
58b1a891ce
3 changed files with 5 additions and 5 deletions
|
@ -148,10 +148,10 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
|
||||||
// ts is later.
|
// ts is later.
|
||||||
var latestData = true;
|
var latestData = true;
|
||||||
if (!isLiveEvent) {
|
if (!isLiveEvent) {
|
||||||
var eventTs = event.ts;
|
var eventTs = event.origin_server_ts;
|
||||||
var storedEvent = $rootScope.events.rooms[event.room_id][event.type];
|
var storedEvent = $rootScope.events.rooms[event.room_id][event.type];
|
||||||
if (storedEvent) {
|
if (storedEvent) {
|
||||||
if (storedEvent.ts > eventTs) {
|
if (storedEvent.origin_server_ts > eventTs) {
|
||||||
// ignore it, we have a newer one already.
|
// ignore it, we have a newer one already.
|
||||||
latestData = false;
|
latestData = false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,7 +59,7 @@ angular.module('RecentsController')
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return lastMsgRoomB.ts - lastMsgRoomA.ts;
|
return lastMsgRoomB.origin_server_ts - lastMsgRoomA.origin_server_ts;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return filtered;
|
return filtered;
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
Declaring it in this way ensures the data-binding -->
|
Declaring it in this way ensures the data-binding -->
|
||||||
{{ lastMsg = eventHandlerService.getLastMessage(room.room_id, true);"" }}
|
{{ 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"/>
|
<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>
|
</td>
|
||||||
|
|
Loading…
Reference in a new issue