OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #308 from aviraldg/feature-rte-improvements 

Fix cursor bug, persist editor mode & rte default
pull/21833/head
David Baker 2016-06-14 19:49:13 +01:00 committed by GitHub
parent 5199cd04a2 3f1b57b35b
commit 8fd8847890
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/views/rooms/MessageComposerInput.js
View File

@ -74,8 +74,14 @@ export default class MessageComposerInput extends React.Component {
this.handleKeyCommand = this.handleKeyCommand.bind(this);
this.onChange = this.onChange.bind(this);
let isRichtextEnabled = window.localStorage.getItem('mx_editor_rte_enabled');
if(isRichtextEnabled == null) {
isRichtextEnabled = 'true';
}
isRichtextEnabled = isRichtextEnabled === 'true';
this.state = {
isRichtextEnabled: false, // TODO enable by default when RTE is mature enough
isRichtextEnabled: isRichtextEnabled,
editorState: null
};
@ -104,11 +110,14 @@ export default class MessageComposerInput extends React.Component {
RichText.getScopedMDDecorators(this.props),
compositeDecorator = new CompositeDecorator(decorators);
let editorState = null;
if (contentState) {
return EditorState.createWithContent(contentState, compositeDecorator);
editorState = EditorState.createWithContent(contentState, compositeDecorator);
} else {
return EditorState.createEmpty(compositeDecorator);
editorState = EditorState.createEmpty(compositeDecorator);
}
return EditorState.moveFocusToEnd(editorState);
}
componentWillMount() {
@ -359,6 +368,8 @@ export default class MessageComposerInput extends React.Component {
});
}
window.localStorage.setItem('mx_editor_rte_enabled', enabled);
this.setState({
isRichtextEnabled: enabled
});