mirror of
https://github.com/showdownjs/showdown.git
synced 2024-03-22 13:30:55 +08:00
fix(subParsers/hashHTMLBlocks.js): fix rendering problems with html5 block elements.
Some HTML5 block elements were not being properly ignored. This caused problems in rendering markdown as showdown would add additional <br /> to some block elements. This commit should fix this issue. Closes #90, closes #140, closes #147
This commit is contained in:
commit
fb3e0ba3bc
BIN
dist/showdown.js
vendored
BIN
dist/showdown.js
vendored
Binary file not shown.
BIN
dist/showdown.js.map
vendored
BIN
dist/showdown.js.map
vendored
Binary file not shown.
BIN
dist/showdown.min.js
vendored
BIN
dist/showdown.min.js
vendored
Binary file not shown.
BIN
dist/showdown.min.js.map
vendored
BIN
dist/showdown.min.js.map
vendored
Binary file not shown.
|
@ -63,7 +63,7 @@ showdown.subParser('hashHTMLBlocks', function (text, options, globals) {
|
|||
) // attacklab: there are sentinel newlines at end of document
|
||||
/gm,function(){...}};
|
||||
*/
|
||||
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,
|
||||
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|address|audio|canvas|figure|hgroup|output|video)\b[^\r]*?<\/\2>[ \t]*(?=\n+)\n)/gm,
|
||||
showdown.subParser('hashElement')(text, options, globals));
|
||||
|
||||
// Special case just for <hr />. It was easier to make a special case than
|
||||
|
|
|
@ -20,3 +20,56 @@
|
|||
</aside>
|
||||
|
||||
<p>the end</p>
|
||||
|
||||
<table class="test">
|
||||
<tr>
|
||||
<td>Foo</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Bar</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<table class="test">
|
||||
<thead>
|
||||
<tr>
|
||||
<td>Foo</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tr>
|
||||
<td>Bar</td>
|
||||
</tr>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td>Bar</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
||||
<audio class="podcastplayer" controls>
|
||||
<source src="foobar.mp3" type="audio/mp3" preload="none"></source>
|
||||
<source src="foobar.off" type="audio/ogg" preload="none"></source>
|
||||
</audio>
|
||||
|
||||
<video src="foo.ogg">
|
||||
<track kind="subtitles" src="foo.en.vtt" srclang="en" label="English">
|
||||
<track kind="subtitles" src="foo.sv.vtt" srclang="sv" label="Svenska">
|
||||
</video>
|
||||
|
||||
<address>My street</address>
|
||||
|
||||
<canvas id="canvas" width="300" height="300">
|
||||
Sorry, your browser doesn't support the <canvas> element.
|
||||
</canvas>
|
||||
|
||||
<figure>
|
||||
<img src="mypic.png" alt="An awesome picture">
|
||||
<figcaption>Caption for the awesome picture</figcaption>
|
||||
</figure>
|
||||
|
||||
<hgroup>
|
||||
<h1>Main title</h1>
|
||||
<h2>Secondary title</h2>
|
||||
</hgroup>
|
||||
|
||||
<output name="result"></output>
|
||||
|
|
|
@ -13,4 +13,57 @@ me</article>
|
|||
ignore me
|
||||
</aside>
|
||||
|
||||
the end
|
||||
the end
|
||||
|
||||
<table class="test">
|
||||
<tr>
|
||||
<td>Foo</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Bar</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<table class="test">
|
||||
<thead>
|
||||
<tr>
|
||||
<td>Foo</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tr>
|
||||
<td>Bar</td>
|
||||
</tr>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td>Bar</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
||||
<audio class="podcastplayer" controls>
|
||||
<source src="foobar.mp3" type="audio/mp3" preload="none"></source>
|
||||
<source src="foobar.off" type="audio/ogg" preload="none"></source>
|
||||
</audio>
|
||||
|
||||
<video src="foo.ogg">
|
||||
<track kind="subtitles" src="foo.en.vtt" srclang="en" label="English">
|
||||
<track kind="subtitles" src="foo.sv.vtt" srclang="sv" label="Svenska">
|
||||
</video>
|
||||
|
||||
<address>My street</address>
|
||||
|
||||
<canvas id="canvas" width="300" height="300">
|
||||
Sorry, your browser doesn't support the <canvas> element.
|
||||
</canvas>
|
||||
|
||||
<figure>
|
||||
<img src="mypic.png" alt="An awesome picture">
|
||||
<figcaption>Caption for the awesome picture</figcaption>
|
||||
</figure>
|
||||
|
||||
<hgroup>
|
||||
<h1>Main title</h1>
|
||||
<h2>Secondary title</h2>
|
||||
</hgroup>
|
||||
|
||||
<output name="result"></output>
|
Loading…
Reference in New Issue
Block a user