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

Merge pull request #2076 from matrix-org/t3chguy/slate_cont2 

Slate Fixes
pull/21833/head
David Baker 2018-07-23 17:25:51 +01:00 committed by GitHub
parent d242935a90 93abb4b74b
commit b8ca65627b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats 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) :(
const fragment = this.html.deserialize(transfer.html);
return change
.setOperationFlag("skip", false)
.setOperationFlag("merge", false)
// XXX: this somehow makes Slate barf on undo and get too empty and break entirely
// .setOperationFlag("skip", false)
// .setOperationFlag("merge", false)
.insertFragment(fragment.document);
} else {
// in MD mode we don't want the rich content pasted as the magic was annoying people so paste plain