Merge pull request #1190 from matrix-org/luke/fix-rte-paste-html-md-on

Only insert HTML into the composer in RTE mode
2017-07-06 13:59:52 +01:00 · 2017-07-06 13:59:52 +01:00 · d9a67355d2
parent 2aa5a3a09c bdefb35c64
commit d9a67355d2
1 changed files with 1 additions and 2 deletions
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@ -488,8 +488,7 @@ export default class MessageComposerInput extends React.Component {
        const currentContent = this.state.editorState.getCurrentContent();

        let contentState = null;
-
-        if (html) {
+        if (html && this.state.isRichtextEnabled) {
            contentState = Modifier.replaceWithFragment(
                currentContent,
                currentSelection,