Merge branch 'develop' into luke/room-list-flux

2018-02-13 10:18:24 +00:00 · 2018-02-13 10:18:24 +00:00 · db0ea9eb0e
commit db0ea9eb0e
parent 322012cf88 03921bad79
51 changed files with 304 additions and 119 deletions
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@ -723,6 +723,7 @@ export default class MessageComposerInput extends React.Component {
        const cmd = SlashCommands.processInput(this.props.room.roomId, commandText);
        if (cmd) {
            if (!cmd.error) {
+                this.historyManager.save(contentState, this.state.isRichtextEnabled ? 'html' : 'markdown');
                this.setState({
                    editorState: this.createEditorState(),
                });