mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 11:47:23 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Weblate 2018-10-11 10:09:29 +00:00
commit f64c274ef3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/rooms/MessageComposerInput.js
View file

@ -423,12 +423,12 @@ export default class MessageComposerInput extends React.Component {
focus: {
key: quote.key,
},
})).collapseToEndOfBlock().insertBlock(Block.create(DEFAULT_NODE)).focus();
})).moveToEndOfBlock().insertBlock(Block.create(DEFAULT_NODE)).focus();
this.onChange(change);
} else {
let fragmentChange = fragment.change();
fragmentChange.moveToRangeOf(fragment.document)
fragmentChange.moveToRangeOfNode(fragment.document)
.wrapBlock(quote);
// FIXME: handle pills and use commonmark rather than md-serialize
@ -838,7 +838,7 @@ export default class MessageComposerInput extends React.Component {
parent.object !== 'document')
{
return change.replaceNodeByKey(editorState.anchorBlock.key, editorState.anchorText)
.collapseToEndOf(parent)
.moveToEndOfNode(parent)
.focus();
}
}
@ -1293,7 +1293,7 @@ export default class MessageComposerInput extends React.Component {
}
// Move selection to the end of the selected history
const change = editorState.change().collapseToEndOf(editorState.document);
const change = editorState.change().moveToEndOfNode(editorState.document);
// We don't call this.onChange(change) now, as fixups on stuff like emoji
// should already have been done and persisted in the history.