forked from showdownjs/showdown
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(simpleLineBreaks): fix simpleLineBreak option breaking lists html
When option was enabled, `<br />` tags where being added wrongfully between `<li>` tags, which resulted in malformed html. This commit prevents this behavior. Closes showdownjs#316
- Loading branch information
Showing
14 changed files
with
139 additions
and
44 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
test/features/#316.new-simpleLineBreaks-option-breaks-lists.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
<ol> | ||
<li>One</li> | ||
<li>Two<ul> | ||
<li>A</li> | ||
<li>B</li></ul></li> | ||
<li>Three</li> | ||
</ol> | ||
<blockquote> | ||
<p>this has<br /> | ||
simple linebreaks</p> | ||
</blockquote> | ||
<pre><code>testing | ||
some | ||
code | ||
</code></pre> | ||
<ol> | ||
<li><p>paragraphed list</p> | ||
<p>this belongs<br /> | ||
to the first list item</p></li> | ||
<li><p>This text<br /> | ||
also</p></li> | ||
</ol> | ||
<p>simple<br /> | ||
text</p> | ||
<ul> | ||
<li>a list<br /> | ||
item</li> | ||
<li>another<br /> | ||
list item</li> | ||
</ul> | ||
<p>simple<br /> | ||
text</p> | ||
<ul> | ||
<li><p>some item</p> | ||
<p>another<br /> | ||
paragraph</p> | ||
<ul> | ||
<li><p>And<br /> | ||
now</p> | ||
<p>paragraph<br /> | ||
sublist</p> | ||
<ul> | ||
<li><p>and<br /> | ||
even</p> | ||
<p>another<br /> | ||
one</p></li></ul></li></ul></li> | ||
<li><p>foo</p></li> | ||
</ul> |
51 changes: 51 additions & 0 deletions
51
test/features/#316.new-simpleLineBreaks-option-breaks-lists.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
1. One | ||
2. Two | ||
- A | ||
- B | ||
3. Three | ||
|
||
> this has | ||
> simple linebreaks | ||
testing | ||
some | ||
code | ||
|
||
1. paragraphed list | ||
|
||
this belongs | ||
to the first list item | ||
|
||
2. This text | ||
also | ||
|
||
simple | ||
text | ||
|
||
- a list | ||
item | ||
- another | ||
list item | ||
|
||
simple | ||
text | ||
|
||
- some item | ||
|
||
another | ||
paragraph | ||
|
||
- And | ||
now | ||
paragraph | ||
sublist | ||
- and | ||
even | ||
another | ||
one | ||
|
||
- foo | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,9 @@ | ||
<ul> | ||
<li>foo | ||
|
||
<ul> | ||
<li>bar</li></ul></li> | ||
<li>foo<ul> | ||
<li>bar</li></ul></li> | ||
</ul> | ||
<p>...</p> | ||
<ul> | ||
<li>baz | ||
|
||
<ol> | ||
<li>bazinga</li></ol></li> | ||
<li>baz<ol> | ||
<li>bazinga</li></ol></li> | ||
</ul> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,11 @@ | ||
<p>Test pre in a list</p> | ||
<ul> | ||
<li>& <</li> | ||
<li><code>& <</code> | ||
|
||
<ul> | ||
<li><code>& <</code><ul> | ||
<li>& <</li> | ||
<li><code>& <</code><ul> | ||
<li>& <</li> | ||
<li><code>& <</code> | ||
|
||
<ul> | ||
<li>& <</li> | ||
<li><code>& <</code> | ||
|
||
<ul> | ||
<li>& <</li> | ||
<li><code>& <</code></li></ul></li></ul></li></ul></li> | ||
<li><code>& <</code><ul> | ||
<li>& <</li> | ||
<li><code>& <</code></li></ul></li></ul></li></ul></li> | ||
</ul> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
Test pre in a list | ||
|
||
- & < | ||
- `& <` | ||
- `& <` | ||
- & < | ||
- `& <` | ||
- & < | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters