fix(subParsers/codeSpans): Fix issue with code html tags not being correctly escaped

This commit is contained in:
Estevão Soares dos Santos 2015-07-14 20:49:04 +01:00
parent 220b85d722
commit 5f043ca46d

View File

@ -26,6 +26,14 @@
showdown.subParser('codeSpans', function (text) { showdown.subParser('codeSpans', function (text) {
'use strict'; 'use strict';
//special case -> literal html code tag
text = text.replace(/(<code[^><]*?>)([^]*?)<\/code>/g, function (wholeMatch, tag, c) {
c = c.replace(/^([ \t]*)/g, ''); // leading whitespace
c = c.replace(/[ \t]*$/g, ''); // trailing whitespace
c = showdown.subParser('encodeCode')(c);
return tag + c + '</code>';
});
/* /*
text = text.replace(/ text = text.replace(/
(^|[^\\]) // Character before opening ` can't be a backslash (^|[^\\]) // Character before opening ` can't be a backslash
@ -38,15 +46,14 @@ showdown.subParser('codeSpans', function (text) {
(?!`) (?!`)
/gm, function(){...}); /gm, function(){...});
*/ */
text = text.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm,
text = text.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm, function (wholeMatch, m1, m2, m3) { function (wholeMatch, m1, m2, m3) {
var c = m3; var c = m3;
c = c.replace(/^([ \t]*)/g, ''); // leading whitespace c = c.replace(/^([ \t]*)/g, ''); // leading whitespace
c = c.replace(/[ \t]*$/g, ''); // trailing whitespace c = c.replace(/[ \t]*$/g, ''); // trailing whitespace
c = showdown.subParser('encodeCode')(c); c = showdown.subParser('encodeCode')(c);
return m1 + '<code>' + c + '</code>'; return m1 + '<code>' + c + '</code>';
}); });
return text; return text;
}); });