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

Fix Markdown conversion to not add extra \n 

Fixes vector-im/vector-web#2094
pull/21833/head
Aviral Dasgupta 2016-09-07 23:56:22 +05:30
parent f0f20beae0
commit 802ec1169f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/views/rooms/MessageComposerInput.js
View File

@ -404,11 +404,13 @@ export default class MessageComposerInput extends React.Component {
enableRichtext(enabled: boolean) { enableRichtext(enabled: boolean) {
if (enabled) { if (enabled) {
let html = mdownToHtml(this.state.editorState.getCurrentContent().getPlainText()); const html = mdownToHtml(this.state.editorState.getCurrentContent().getPlainText());
this.setEditorState(this.createEditorState(enabled, RichText.HTMLtoContentState(html))); const contentState = RichText.HTMLtoContentState(html);
this.setEditorState(this.createEditorState(enabled, contentState));
} else { } else {
let markdown = stateToMarkdown(this.state.editorState.getCurrentContent()), let markdown = stateToMarkdown(this.state.editorState.getCurrentContent());
contentState = ContentState.createFromText(markdown); markdown = markdown.substring(0, markdown.length - 1); // stateToMarkdown tacks on an extra newline (?!?)
const contentState = ContentState.createFromText(markdown);
this.setEditorState(this.createEditorState(enabled, contentState)); this.setEditorState(this.createEditorState(enabled, contentState));
} }