StarMirror/showdown
1
0
Fork 0
mirror of https://github.com/showdownjs/showdown.git synced 2024-03-22 13:30:55 +08:00
Code Issues Projects Releases Wiki Activity

Added support for new HTML5 structural tags to "pass through" without being wrapped in a <p>

Browse Source
This commit is contained in:
Titus 2012-06-14 00:52:20 -06:00
parent c2e28da129
commit bab6b888ef
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/showdown.js
View File

@ -215,8 +215,8 @@ var _HashHTMLBlocks = function(text) {
// "paragraphs" that are wrapped in non-block-level tags, such as anchors, // "paragraphs" that are wrapped in non-block-level tags, such as anchors,
// phrase emphasis, and spans. The list of tags we're looking for is // phrase emphasis, and spans. The list of tags we're looking for is
// hard-coded: // hard-coded:
var block_tags_a = "p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del|style"; var block_tags_a = "p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|ins|del|style|section|header|footer|nav|article|aside";
var block_tags_b = "p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|style"; var block_tags_b = "p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|style|section|header|footer|nav|article|aside";
// First, look for nested blocks, e.g.: // First, look for nested blocks, e.g.:
// <div> // <div>
@ -265,7 +265,7 @@ var _HashHTMLBlocks = function(text) {
) // attacklab: there are sentinel newlines at end of document ) // attacklab: there are sentinel newlines at end of document
/gm,function(){...}}; /gm,function(){...}};
*/ */
text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|style)\b[^\r]*?.*<\/\2>[ \t]*(?=\n+)\n)/gm,hashElement); text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math|style|section|header|footer|nav|article|aside)\b[^\r]*?.*<\/\2>[ \t]*(?=\n+)\n)/gm,hashElement);
// Special case just for <hr />. It was easier to make a special case than // Special case just for <hr />. It was easier to make a special case than
// to make the other regex more complicated. // to make the other regex more complicated.

16
test/cases/html5-strutural-tags.html Normal file
View File

@ -0,0 +1,16 @@
<p>These HTML5 tags should pass through just fine.</p>
<section>hello</section>
<header>head</header>
<footer>footsies</footer>
<nav>navigation</nav>
<article>read me</article>
<aside>ignore me</aside>
<p>the end</p>

11
test/cases/html5-strutural-tags.md Normal file
View File

@ -0,0 +1,11 @@
These HTML5 tags should pass through just fine.
<section>hello</section>
<header>head</header>
<footer>footsies</footer>
<nav>navigation</nav>
<article>read me</article>
<aside>ignore me</aside>
the end