imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Weblate 2018-07-23 16:25:55 +00:00
commit 3eb832aa2f
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -983,8 +983,9 @@ export default class MessageComposerInput extends React.Component {
// that we will silently discard nested blocks (e.g. nested lists) :( // that we will silently discard nested blocks (e.g. nested lists) :(
const fragment = this.html.deserialize(transfer.html); const fragment = this.html.deserialize(transfer.html);
return change return change
.setOperationFlag("skip", false) // XXX: this somehow makes Slate barf on undo and get too empty and break entirely
.setOperationFlag("merge", false) // .setOperationFlag("skip", false)
// .setOperationFlag("merge", false)
.insertFragment(fragment.document); .insertFragment(fragment.document);
} else { } else {
// in MD mode we don't want the rich content pasted as the magic was annoying people so paste plain // in MD mode we don't want the rich content pasted as the magic was annoying people so paste plain