more RTE fixes

matrix-org · Jun 14, 2016 · ba69e4365d3c97752d8dfccbd33a2c305e0f707b · ba69e43
1 parent 8cb086e
commit ba69e4365d3c97752d8dfccbd33a2c305e0f707b
Unified Split

Showing with 3 additions and 2 deletions.

+2 −1 src/RichText.js

+1 −1 src/components/views/rooms/MessageComposerInput.js
diff --git a/src/RichText.js b/src/RichText.js
@@ -141,7 +141,8 @@ export function modifyText(contentState: ContentState, rangeToReplace: Selection
    for(let currentKey = startKey;
            currentKey && currentKey !== endKey;
            currentKey = contentState.getKeyAfter(currentKey)) {
-        text += getText(currentKey).substring(startOffset, blockText.length);
+        let blockText = getText(currentKey);
+        text += blockText.substring(startOffset, blockText.length);

        // from now on, we'll take whole blocks
        startOffset = 0;
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
@@ -199,7 +199,7 @@ export default class MessageComposerInput extends React.Component {
                if (contentJSON) {
                    let content = convertFromRaw(JSON.parse(contentJSON));
                    component.setState({
-                        editorState: component.createEditorState(this.state.isRichtextEnabled, content)
+                        editorState: component.createEditorState(component.state.isRichtextEnabled, content)
                    });
                }
            }