Skip to content

Commit ed2cf59

Browse files
committed
fix(blockQuote): fix 'github style codeblocks' not being parsed inside 'blockquote'
Closes #192
1 parent e754668 commit ed2cf59

File tree

7 files changed

+35
-5
lines changed

7 files changed

+35
-5
lines changed

dist/showdown.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/showdown.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/showdown.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/showdown.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/subParsers/blockQuotes.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ showdown.subParser('blockQuotes', function (text, options, globals) {
2525
bq = bq.replace(/~0/g, '');
2626

2727
bq = bq.replace(/^[ \t]+$/gm, ''); // trim whitespace-only lines
28+
bq = showdown.subParser('githubCodeBlocks')(bq, options, globals);
2829
bq = showdown.subParser('blockGamut')(bq, options, globals); // recurse
2930

3031
bq = bq.replace(/(^|\n)/g, '$1 ');
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<blockquote>
2+
<p>Define a function in javascript:</p>
3+
4+
<pre><code>function MyFunc(a) {
5+
var s = '`';
6+
}
7+
</code></pre>
8+
9+
<blockquote>
10+
<p>And some nested quote</p>
11+
12+
<pre><code class="html language-html">&lt;div&gt;HTML!&lt;/div&gt;
13+
</code></pre>
14+
</blockquote>
15+
</blockquote>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
> Define a function in javascript:
2+
>
3+
> ```
4+
> function MyFunc(a) {
5+
> var s = '`';
6+
> }
7+
> ```
8+
>
9+
>> And some nested quote
10+
>>
11+
>> ```html
12+
>> <div>HTML!</div>
13+
>> ```

0 commit comments

Comments
 (0)