diff options
| -rw-r--r-- | docs/specification.rst | 8 | ||||
| -rw-r--r-- | webclient/room/room-controller.js | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/docs/specification.rst b/docs/specification.rst index d8189996cf..b15792c00d 100644 --- a/docs/specification.rst +++ b/docs/specification.rst @@ -755,15 +755,17 @@ There are several APIs provided to ``GET`` events for a room: Description: Get all ``m.room.member`` state events. Response format: - ``{ "start": "token", "end": "token", "chunk": [ { m.room.member event }, ... ] }`` + ``{ "start": "<token>", "end": "<token>", "chunk": [ { m.room.member event }, ... ] }`` Example: TODO |/rooms/<room_id>/messages|_ Description: - Get all ``m.room.message`` events. + Get all ``m.room.message`` and ``m.room.member`` events. This API supports pagination + using ``from`` and ``to`` query parameters, coupled with the ``start`` and ``end`` + tokens from an |initialSync|_ API. Response format: - ``{ TODO }`` + ``{ "start": "<token>", "end": "<token>" }`` Example: TODO 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 |