Make markdown less aggressive #492

dbkr · 2016-09-22T17:28:30Z

Use some more advanced (public) interface of marked to improve our detection of when a message contains markdown and what markdown gets rendered.
Disable marked's linkification of plain links which isn't very good.
Stop any message with quotes or other characters normally escaped in html from being sent as HTML messages when they otherwise would not be.

Preserves the old behaviour of not wrapping everything in p tags, but also returns valid markup if the resulting markdown contains multiple paragraphs (previously it stripped the <p> from the start and the </p> from the end, leaving closing and opening paragraph tags in the middle of the returned markup). Also turn on the 'xhtml' option so marked uses self-closing tags for br's, hr's and so forth.

richvdh

lgtm except typoes

richvdh · 2016-09-22T17:41:38Z

src/Markdown.js

+
+// replace the default link renderer function
+// to prevent marked from turning plain URLs
+// into links, because tits algorithm is fairly


richvdh · 2016-09-23T12:47:31Z

src/Markdown.js

+    }
+
+    _copyTokens() {
+        // copy tokens (the parser modifies it's input arg)


s/it's/its/

Equivalent of #492 for rich text mode

dbkr added 3 commits September 22, 2016 17:18

Better detection of when input contains markdown

6c7259e

Disable link detection, as per comment

0eddea1

dbkr assigned richvdh Sep 22, 2016

dbkr added 2 commits September 22, 2016 18:37

Remove unused code

de0c92d

Better logic for wrapping in p tags or not

6ba20ec

richvdh approved these changes Sep 23, 2016

View reviewed changes

richvdh assigned dbkr and unassigned richvdh Sep 23, 2016

Typos

90c9d51

dbkr merged commit d0a1597 into develop Sep 23, 2016

dbkr added a commit that referenced this pull request Sep 23, 2016

Make RTE mode use the new Markdown wrapper class

db3f0d2

Equivalent of #492 for rich text mode

dbkr mentioned this pull request Sep 23, 2016

Make RTE mode use the new Markdown wrapper class #497

Merged

richvdh deleted the dbkr/make_markdown_less_aggressive branch February 15, 2017 13:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make markdown less aggressive #492

Make markdown less aggressive #492

dbkr commented Sep 22, 2016

richvdh left a comment

richvdh Sep 22, 2016 •

edited

Loading

richvdh Sep 23, 2016

Make markdown less aggressive #492

Make markdown less aggressive #492

Conversation

dbkr commented Sep 22, 2016

richvdh left a comment

Choose a reason for hiding this comment

richvdh Sep 22, 2016 • edited Loading

Choose a reason for hiding this comment

richvdh Sep 23, 2016

Choose a reason for hiding this comment

richvdh Sep 22, 2016 •

edited

Loading