From e460cf35e0c553825a5d3ee2f11b449249acdcbd Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 20 May 2018 22:48:40 +0100 Subject: [PATCH] hide formatting bar for MD editor --- src/components/views/rooms/MessageComposer.js | 2 +- src/components/views/rooms/MessageComposerInput.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js index 4d00927767..28502c348d 100644 --- a/src/components/views/rooms/MessageComposer.js +++ b/src/components/views/rooms/MessageComposer.js @@ -354,7 +354,7 @@ export default class MessageComposer extends React.Component { } let formatBar; - if (this.state.showFormatting) { + if (this.state.showFormatting && this.state.inputState.isRichTextEnabled) { const {marks, blockType} = this.state.inputState; const formatButtons = ["bold", "italic", "deleted", "underlined", "code", "block-quote", "bulleted-list", "numbered-list"].map( (name) => { diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index 2d5e6d050d..2bb35c5656 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -1405,9 +1405,7 @@ export default class MessageComposerInput extends React.Component { }; onFormatButtonClicked = (name, e) => { - if (e) { - e.preventDefault(); // don't steal focus from the editor! - } + e.preventDefault(); // don't steal focus from the editor! // XXX: horrible evil hack to ensure the editor is focused so the act // of focusing it doesn't then cancel the format button being pressed