mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-11-30 23:31:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1153 from matrix-org/luke/fix-rte-pre-extra-nls

Browse source 
Work around draft-js-export-html#62 by post-processing <br>\n
This commit is contained in:
Luke Barnard 2017-06-28 15:13:39 +01:00 committed by GitHub
commit b3eee0c007
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/HtmlUtils.js
View file

@ -84,7 +84,8 @@ export function charactersToImageNode(alt, useSvg, ...unicode) {
} }
export function stripParagraphs(html: string): string { export function processHtmlForSending(html: string): string {
const contentDiv = document.createElement('div'); const contentDiv = document.createElement('div');
contentDiv.innerHTML = html; contentDiv.innerHTML = html;
@ -97,6 +98,13 @@ export function stripParagraphs(html: string): string {
const element = contentDiv.children[i]; const element = contentDiv.children[i];
if (element.tagName.toLowerCase() === 'p') { if (element.tagName.toLowerCase() === 'p') {
contentHTML += element.innerHTML + '<br />'; contentHTML += element.innerHTML + '<br />';
} else if (element.tagName.toLowerCase() === 'pre') {
// Replace "<br>\n" with "\n" within `<pre>` tags because the <br> is
// redundant. This is a workaround for a bug in draft-js-export-html:
// https://github.com/sstur/draft-js-export-html/issues/62
contentHTML += '<pre>' +
element.innerHTML.replace(/<br>\n/g, '\n').trim() +
'</pre>';
} else { } else {
const temp = document.createElement('div'); const temp = document.createElement('div');
temp.appendChild(element.cloneNode(true)); temp.appendChild(element.cloneNode(true));

2
src/components/views/rooms/MessageComposerInput.js
View file

@ -507,7 +507,7 @@ export default class MessageComposerInput extends React.Component {
} }
if (this.state.isRichtextEnabled) { if (this.state.isRichtextEnabled) {
contentHTML = HtmlUtils.stripParagraphs( contentHTML = HtmlUtils.processHtmlForSending(
RichText.contentStateToHTML(contentState), RichText.contentStateToHTML(contentState),
); );
} else { } else {