summary refs log tree commit diff
path: root/webclient
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-12 18:27:44 +0100
committerErik Johnston <erik@matrix.org>2014-09-12 18:27:44 +0100
commitc7bcd87f3768e2e2f0ba29cf8744ad12a5a0e78a (patch)
treeb6ac5abf5ff91d919f899ab64e2d242a55bcdaff /webclient
parentUpdate the spec document to replace the candidate message with the candidates... (diff)
parentSpellcheck (diff)
downloadsynapse-c7bcd87f3768e2e2f0ba29cf8744ad12a5a0e78a.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'webclient')
-rw-r--r--webclient/room/room-controller.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js

index 3cc127140b..45dfff95c2 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js
@@ -598,6 +598,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) promise.then( function(response) { console.log("Request successfully sent"); + if (echo) { // Mark this fake message event with its allocated event_id // When the true message event will come from the events stream (in handleMessage),