summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-09-06 17:48:16 -0700
committerMatthew Hodgson <matthew@matrix.org>2014-09-06 17:48:16 -0700
commit64b6f09b0d2136394deb46c83e9ba55f044fcbec (patch)
treed259ce088df47b4632a75898e46ead06b98895e1
parentMerge branch 'release-v0.2.2' of github.com:matrix-org/synapse (diff)
downloadsynapse-64b6f09b0d2136394deb46c83e9ba55f044fcbec.tar.xz
fix embarassing bug where in-progress messages get vaped when the previous one gets delivered
-rw-r--r--webclient/room/room-controller.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index c702917fef..c8ca771b25 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -485,7 +485,9 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
             promise.then(
                 function() {
                     console.log("Request successfully sent");
-                    $scope.textInput = "";
+                    if (!echo) {
+                        $scope.textInput = "";
+                    }
 /*
                     if (echoMessage) {
                         // Remove the fake echo message from the room messages