diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-12 18:27:44 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-12 18:27:44 +0100 |
| commit | c7bcd87f3768e2e2f0ba29cf8744ad12a5a0e78a (patch) | |
| tree | b6ac5abf5ff91d919f899ab64e2d242a55bcdaff /webclient/room/room-controller.js | |
| parent | Update the spec document to replace the candidate message with the candidates... (diff) | |
| parent | Spellcheck (diff) | |
| download | synapse-c7bcd87f3768e2e2f0ba29cf8744ad12a5a0e78a.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'webclient/room/room-controller.js')
| -rw-r--r-- | webclient/room/room-controller.js | 1 |
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), |