Skip to content

Commit

Permalink
Fix cursor bug, persist editor mode & rte default
Browse files Browse the repository at this point in the history
  • Loading branch information
aviraldg committed Jun 14, 2016
1 parent 5199cd0 commit 3f1b57b
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions src/components/views/rooms/MessageComposerInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
};

Expand Down Expand Up @@ -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() {
Expand Down Expand Up @@ -359,6 +368,8 @@ export default class MessageComposerInput extends React.Component {
});
}

window.localStorage.setItem('mx_editor_rte_enabled', enabled);

this.setState({
isRichtextEnabled: enabled
});
Expand Down

0 comments on commit 3f1b57b

Please sign in to comment.