naima/online-identities
1
0
Fork 0
forked from blallo/talk-hm-0x15
Code Releases Activity

rollback change in showndown, stop highlight.js's html entity escape #523

Browse source
This commit is contained in:
Hakim El Hattab 2012-09-28 00:14:57 -04:00
parent 78b9bb43e1
commit e79bc38b43
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/js/highlight.js
View file

File diff suppressed because one or more lines are too long

9
lib/js/showdown.js
View file

@ -992,16 +992,13 @@ var _EncodeCode = function(text) {
// The point is that in code, these characters are literals,
// and lose their special Markdown meanings.
//
// Hakim: Escaping these causes issues in code blocks
// Encode all ampersands; HTML entities are not
// entities within a Markdown code span.
// text = text.replace(/&/g,"&");
text = text.replace(/&/g,"&");
// Do the angle bracket song and dance:
// text = text.replace(/</g,"&lt;");
// text = text.replace(/>/g,"&gt;");
text = text.replace(/</g,"&lt;");
text = text.replace(/>/g,"&gt;");
// Now, escape characters that are magic in Markdown:
text = escapeCharacters(text,"\*_{}[]\\",false);