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

fix(blockQuote): fix 'github style codeblocks' not being parsed inside 'blockquote'

Browse Source 
Closes #192
This commit is contained in:
Estevão Soares dos Santos 2015-08-25 21:10:49 +01:00
parent e754668814
commit ed2cf595b0
7 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dist/showdown.js vendored
View File

@ -1,4 +1,4 @@
;/*! showdown 23-08-2015 */
;/*! showdown 25-08-2015 */
(function(){
/**
* Created by Tivie on 13-07-2015.
@ -1077,6 +1077,7 @@ showdown.subParser('blockQuotes', function (text, options, globals) {
bq = bq.replace(/~0/g, '');
bq = bq.replace(/^[ \t]+$/gm, ''); // trim whitespace-only lines
bq = showdown.subParser('githubCodeBlocks')(bq, options, globals);
bq = showdown.subParser('blockGamut')(bq, options, globals); // recurse
bq = bq.replace(/(^|\n)/g, '$1 ');

2
dist/showdown.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/showdown.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/showdown.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

1
src/subParsers/blockQuotes.js
View File

@ -25,6 +25,7 @@ showdown.subParser('blockQuotes', function (text, options, globals) {
bq = bq.replace(/~0/g, '');
bq = bq.replace(/^[ \t]+$/gm, ''); // trim whitespace-only lines
bq = showdown.subParser('githubCodeBlocks')(bq, options, globals);
bq = showdown.subParser('blockGamut')(bq, options, globals); // recurse
bq = bq.replace(/(^|\n)/g, '$1 ');

15
test/cases/github-style-codeblock-inside-quote.html Normal file
View File

@ -0,0 +1,15 @@
<blockquote>
<p>Define a function in javascript:</p>
<pre><code>function MyFunc(a) {
var s = '`';
}
</code></pre>
<blockquote>
<p>And some nested quote</p>
<pre><code class="html language-html">&lt;div&gt;HTML!&lt;/div&gt;
</code></pre>
</blockquote>
</blockquote>

13
test/cases/github-style-codeblock-inside-quote.md Normal file
View File

@ -0,0 +1,13 @@
> Define a function in javascript:
>
> ```
> function MyFunc(a) {
> var s = '`';
> }
> ```
>
>> And some nested quote
>>
>> ```html
>> <div>HTML!</div>
>> ```