hide formatting bar for MD editor

pull/21833/head
Matthew Hodgson 2018-05-20 22:48:40 +01:00
parent f981d7b729
commit e460cf35e0
2 changed files with 2 additions and 4 deletions

View File

@ -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) => {

View File

@ -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