Skip to content

Fix handling of adjacent lists.#684

Merged
styfle merged 1 commit into
markedjs:masterfrom
kohler:adjacentlists
Dec 10, 2018
Merged

Fix handling of adjacent lists.#684
styfle merged 1 commit into
markedjs:masterfrom
kohler:adjacentlists

Conversation

@kohler

@kohler kohler commented Nov 16, 2015

Copy link
Copy Markdown
Contributor

An ordered list followed by an unordered list shouldn't be combined, even in non-smartLists mode.

Should fix #530.

@janhui

janhui commented Jul 5, 2016

Copy link
Copy Markdown

Would it be possible to merge this in? it does fix #530

@UziTech

UziTech commented Dec 5, 2018

Copy link
Copy Markdown
Member

I would like to get this PR merged @kohler would you be able to merge the current master so the tests will run? Or would you like me to do it in a new PR?

@kohler

kohler commented Dec 6, 2018

Copy link
Copy Markdown
Contributor Author

I updated. I didn't check in the minified file though—not sure what you prefer there (or what Travis expects).

@UziTech UziTech left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like travis is failing because of linting

/home/travis/build/markedjs/marked/lib/marked.js
  360:42  error    Expected '===' and instead saw '=='             eqeqeq
  361:1   warning  Expected indentation of 12 spaces but found 14  indent

Comment thread test/new/adjacent_lists.text
Comment thread test/tests/adjacent_lists.text Outdated
@UziTech

UziTech commented Dec 6, 2018

Copy link
Copy Markdown
Member

Travis will update the minified file automatically when this PR is merged

An ordered list followed by an unordered list shouldn't be combined,
even in non-smartLists mode.

Should fix markedjs#530.
@kohler kohler force-pushed the adjacentlists branch 3 times, most recently from 58c8e75 to a48a9f0 Compare December 10, 2018 16:34
@kohler

kohler commented Dec 10, 2018

Copy link
Copy Markdown
Contributor Author

Travis no longer complains and I changed the tests as requested.

@UziTech

UziTech commented Dec 10, 2018

Copy link
Copy Markdown
Member

Nice 🎉.

We will just need one more approval from the markedjs team.
/cc @styfle @joshbruce @davisjam

@styfle styfle left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wonderful, thanks for fixing these pesky lists! 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Weird list rendering behavior

5 participants