Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
47772470c9
2 changed files with 13 additions and 14 deletions
src
|
@ -186,7 +186,6 @@ const sanitizeHtmlParams = {
|
||||||
],
|
],
|
||||||
allowedAttributes: {
|
allowedAttributes: {
|
||||||
// custom ones first:
|
// custom ones first:
|
||||||
blockquote: ['data-mx-reply'], // used to allow explicit removal of a reply fallback blockquote, value ignored
|
|
||||||
font: ['color', 'data-mx-bg-color', 'data-mx-color', 'style'], // custom to matrix
|
font: ['color', 'data-mx-bg-color', 'data-mx-color', 'style'], // custom to matrix
|
||||||
span: ['data-mx-bg-color', 'data-mx-color', 'style'], // custom to matrix
|
span: ['data-mx-bg-color', 'data-mx-color', 'style'], // custom to matrix
|
||||||
a: ['href', 'name', 'target', 'rel'], // remote target: custom to matrix
|
a: ['href', 'name', 'target', 'rel'], // remote target: custom to matrix
|
||||||
|
|
|
@ -81,7 +81,7 @@ export default class ReplyThread extends React.Component {
|
||||||
|
|
||||||
// Part of Replies fallback support
|
// Part of Replies fallback support
|
||||||
static stripHTMLReply(html) {
|
static stripHTMLReply(html) {
|
||||||
return html.replace(/^<blockquote data-mx-reply>[\s\S]+?<!--end-mx-reply--><\/blockquote>/, '');
|
return html.replace(/^<mx-reply>[\s\S]+?<\/mx-reply>/, '');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Part of Replies fallback support
|
// Part of Replies fallback support
|
||||||
|
@ -102,8 +102,8 @@ export default class ReplyThread extends React.Component {
|
||||||
switch (ev.getContent().msgtype) {
|
switch (ev.getContent().msgtype) {
|
||||||
case 'm.text':
|
case 'm.text':
|
||||||
case 'm.notice': {
|
case 'm.notice': {
|
||||||
html = `<blockquote data-mx-reply><a href="${evLink}">In reply to</a> <a href="${userLink}">${mxid}</a>`
|
html = `<mx-reply><blockquote><a href="${evLink}">In reply to</a> <a href="${userLink}">${mxid}</a>`
|
||||||
+ `<br>${html || body}<!--end-mx-reply--></blockquote>`;
|
+ `<br>${html || body}</blockquote></mx-reply>`;
|
||||||
const lines = body.trim().split('\n');
|
const lines = body.trim().split('\n');
|
||||||
if (lines.length > 0) {
|
if (lines.length > 0) {
|
||||||
lines[0] = `<${mxid}> ${lines[0]}`;
|
lines[0] = `<${mxid}> ${lines[0]}`;
|
||||||
|
@ -112,28 +112,28 @@ export default class ReplyThread extends React.Component {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'm.image':
|
case 'm.image':
|
||||||
html = `<blockquote data-mx-reply><a href="${evLink}">In reply to</a> <a href="${userLink}">${mxid}</a>`
|
html = `<mx-reply><blockquote><a href="${evLink}">In reply to</a> <a href="${userLink}">${mxid}</a>`
|
||||||
+ `<br>sent an image.<!--end-mx-reply--></blockquote>`;
|
+ `<br>sent an image.</blockquote></mx-reply>`;
|
||||||
body = `> <${mxid}> sent an image.\n\n`;
|
body = `> <${mxid}> sent an image.\n\n`;
|
||||||
break;
|
break;
|
||||||
case 'm.video':
|
case 'm.video':
|
||||||
html = `<blockquote data-mx-reply><a href="${evLink}">In reply to</a> <a href="${userLink}">${mxid}</a>`
|
html = `<mx-reply><blockquote><a href="${evLink}">In reply to</a> <a href="${userLink}">${mxid}</a>`
|
||||||
+ `<br>sent a video.<!--end-mx-reply--></blockquote>`;
|
+ `<br>sent a video.</blockquote></mx-reply>`;
|
||||||
body = `> <${mxid}> sent a video.\n\n`;
|
body = `> <${mxid}> sent a video.\n\n`;
|
||||||
break;
|
break;
|
||||||
case 'm.audio':
|
case 'm.audio':
|
||||||
html = `<blockquote data-mx-reply><a href="${evLink}">In reply to</a> <a href="${userLink}">${mxid}</a>`
|
html = `<mx-reply><blockquote><a href="${evLink}">In reply to</a> <a href="${userLink}">${mxid}</a>`
|
||||||
+ `<br>sent an audio file.<!--end-mx-reply--></blockquote>`;
|
+ `<br>sent an audio file.</blockquote></mx-reply>`;
|
||||||
body = `> <${mxid}> sent an audio file.\n\n`;
|
body = `> <${mxid}> sent an audio file.\n\n`;
|
||||||
break;
|
break;
|
||||||
case 'm.file':
|
case 'm.file':
|
||||||
html = `<blockquote data-mx-reply><a href="${evLink}">In reply to</a> <a href="${userLink}">${mxid}</a>`
|
html = `<mx-reply><blockquote><a href="${evLink}">In reply to</a> <a href="${userLink}">${mxid}</a>`
|
||||||
+ `<br>sent a file.<!--end-mx-reply--></blockquote>`;
|
+ `<br>sent a file.</blockquote></mx-reply>`;
|
||||||
body = `> <${mxid}> sent a file.\n\n`;
|
body = `> <${mxid}> sent a file.\n\n`;
|
||||||
break;
|
break;
|
||||||
case 'm.emote': {
|
case 'm.emote': {
|
||||||
html = `<blockquote data-mx-reply><a href="${evLink}">In reply to</a> * `
|
html = `<mx-reply><blockquote><a href="${evLink}">In reply to</a> * `
|
||||||
+ `<a href="${userLink}">${mxid}</a><br>${html || body}<!--end-mx-reply--></blockquote>`;
|
+ `<a href="${userLink}">${mxid}</a><br>${html || body}</blockquote></mx-reply>`;
|
||||||
const lines = body.trim().split('\n');
|
const lines = body.trim().split('\n');
|
||||||
if (lines.length > 0) {
|
if (lines.length > 0) {
|
||||||
lines[0] = `* <${mxid}> ${lines[0]}`;
|
lines[0] = `* <${mxid}> ${lines[0]}`;
|
||||||
|
|
Loading…
Reference in a new issue