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

2018-07-23 16:25:55 +00:00 · 2018-07-23 16:25:55 +00:00 · 3eb832aa2f
parent d5093b7ba0 b8ca65627b
commit 3eb832aa2f
1 changed files with 3 additions and 2 deletions
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@ -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