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

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-07-27 13:01:01 +00:00
parent 1e9f2f112d b6ebb0cc37
commit c62562eb59
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1255,16 +1255,14 @@ export default class MessageComposerInput extends React.Component {
let editorState;
const historyItem = this.historyManager.getItem(delta);
if (historyItem) {
if (historyItem.format === 'rich' && !this.state.isRichTextEnabled) {
editorState = this.richToMdEditorState(historyItem.value);
}
else if (historyItem.format === 'markdown' && this.state.isRichTextEnabled) {
editorState = this.mdToRichEditorState(historyItem.value);
}
else {
editorState = historyItem.value;
}
if (!historyItem) return;
if (historyItem.format === 'rich' && !this.state.isRichTextEnabled) {
editorState = this.richToMdEditorState(historyItem.value);
} else if (historyItem.format === 'markdown' && this.state.isRichTextEnabled) {
editorState = this.mdToRichEditorState(historyItem.value);
} else {
editorState = historyItem.value;
}
// Move selection to the end of the selected history
@ -1544,18 +1542,6 @@ export default class MessageComposerInput extends React.Component {
this.handleKeyCommand('toggle-mode');
};
onBlur = (e) => {
this.selection = this.state.editorState.selection;
};
onFocus = (e) => {
if (this.selection) {
const change = this.state.editorState.change().select(this.selection);
this.onChange(change);
delete this.selection;
}
};
focusComposer = () => {
this.refs.editor.focus();
};
@ -1601,8 +1587,6 @@ export default class MessageComposerInput extends React.Component {
onChange={this.onChange}
onKeyDown={this.onKeyDown}
onPaste={this.onPaste}
onBlur={this.onBlur}
onFocus={this.onFocus}
renderNode={this.renderNode}
renderMark={this.renderMark}
// disable spell check for the placeholder because browsers don't like "unencrypted"