diff options
author | Kegan Dougal <kegan@matrix.org> | 2014-11-13 11:58:28 +0000 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2014-11-13 11:58:28 +0000 |
commit | 51802854562351a04f8cfd248a9aefb25a5508e7 (patch) | |
tree | 2a2913f4856712ed1331036fc7e6c91e0d6bb244 /syweb | |
parent | SYWEB-152: Migrate IRC command logic to commands-service. (diff) | |
download | synapse-51802854562351a04f8cfd248a9aefb25a5508e7.tar.xz |
SYWEB-152: Unbreak /me
Diffstat (limited to 'syweb')
-rw-r--r-- | syweb/webclient/room/room-controller.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/syweb/webclient/room/room-controller.js b/syweb/webclient/room/room-controller.js index bea0db5759..7094a703f0 100644 --- a/syweb/webclient/room/room-controller.js +++ b/syweb/webclient/room/room-controller.js @@ -435,9 +435,13 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput', 'a // Store the command in the history history.push(input); - var promise = commandsService.processInput($scope.room_id, input); - var echo = false; var isEmote = input.indexOf("/me ") === 0; + var promise; + if (!isEmote) { + promise = commandsService.processInput($scope.room_id, input); + } + var echo = false; + if (!promise) { // not a non-echoable command echo = true; |