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-controller.js | |
| 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-controller.js')
| -rw-r--r-- | webclient/room/room-controller.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index d8c62c231e..a1d2e87039 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -603,9 +603,9 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) var echoMessage = { content: { body: (cmd === "/me" ? args : input), - hsob_ts: new Date().getTime(), // fake a timestamp msgtype: (cmd === "/me" ? "m.emote" : "m.text"), }, + origin_server_ts: new Date().getTime(), // fake a timestamp room_id: $scope.room_id, type: "m.room.message", user_id: $scope.state.user_id, @@ -640,7 +640,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) if (echoMessage) { // Mark the message as unsent for the rest of the page life - echoMessage.content.hsob_ts = "Unsent"; + echoMessage.origin_server_ts = "Unsent"; echoMessage.echo_msg_state = "messageUnSent"; } }); |