PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1694 from matrix-org/revert-1270-luke/fix-md-unescaped-tokens

Browse source 
Revert "MD-escape URLs/alises/user IDs prior to parsing markdown"
This commit is contained in:
Matthew Hodgson 2018-01-07 20:31:07 +00:00 committed by GitHub
commit bcc3a4870a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Markdown.js
View file

@ -55,25 +55,6 @@ function is_multi_line(node) {
return par.firstChild != par.lastChild;
}
import linkifyMatrix from './linkify-matrix';
import * as linkify from 'linkifyjs';
linkifyMatrix(linkify);
// Thieved from draft-js-export-markdown
function escapeMarkdown(s) {
return s.replace(/[*_`]/g, '\\$&');
}
// Replace URLs, room aliases and user IDs with md-escaped URLs
function linkifyMarkdown(s) {
const links = linkify.find(s);
links.forEach((l) => {
// This may replace several instances of `l.value` at once, but that's OK
s = s.replace(l.value, escapeMarkdown(l.value));
});
return s;
}
/**
* Class that wraps commonmark, adding the ability to see whether
* a given message actually uses any markdown syntax or whether
@ -81,7 +62,7 @@ function linkifyMarkdown(s) {
*/
export default class Markdown {
constructor(input) {
this.input = linkifyMarkdown(input);
this.input = input;
const parser = new commonmark.Parser();
this.parsed = parser.parse(this.input);